diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-13 20:57:50 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-13 20:57:50 +0200 |
commit | ded9a4b1aa68b8645271a63e9543ef56177ae642 (patch) | |
tree | d351102a17ab05c6e263e970f43ab3b30561112e /pkgs | |
parent | 98df4f635136e63644cb0ab646b55d60cbb444a4 (diff) | |
parent | 5b0398dc36ce5746d8d54e04a1dfcab25939484a (diff) |
Merge branch 'staging-next' into staging
Commits from master, conflict resolutions, etc.
Diffstat (limited to 'pkgs')
344 files changed, 4853 insertions, 6188 deletions
diff --git a/pkgs/applications/altcoins/namecoin.nix b/pkgs/applications/altcoins/namecoin.nix index 9af37ff0bca67..93f9faf833a1d 100644 --- a/pkgs/applications/altcoins/namecoin.nix +++ b/pkgs/applications/altcoins/namecoin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkgconfig, qt4, protobuf, libqrencode +{ stdenv, fetchFromGitHub, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkgconfig, qt4, protobuf, libqrencode, hexdump , withGui }: with stdenv.lib; @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig + hexdump ]; buildInputs = [ @@ -31,6 +32,8 @@ stdenv.mkDerivation rec { libqrencode ]; + enableParallelBuilding = true; + configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]; diff --git a/pkgs/applications/audio/MMA/default.nix b/pkgs/applications/audio/MMA/default.nix index d21c3fd5efbd9..ed7a8481f693c 100644 --- a/pkgs/applications/audio/MMA/default.nix +++ b/pkgs/applications/audio/MMA/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, python, alsaUtils, timidity }: +{ stdenv, fetchurl, makeWrapper, python3, alsaUtils, timidity }: stdenv.mkDerivation rec { version = "16.06"; @@ -9,7 +9,7 @@ sha256 = "1g4gvc0nr0qjc0fyqrnx037zpaasgymgmrm5s7cdxqnld9wqw8ww"; }; - buildInputs = [ makeWrapper python alsaUtils timidity ]; + buildInputs = [ makeWrapper python3 alsaUtils timidity ]; patchPhase = '' sed -i 's@/usr/bin/aplaymidi@/${alsaUtils}/bin/aplaymidi@g' mma-splitrec @@ -18,7 +18,7 @@ sed -i 's@/usr/bin/arecord@/${alsaUtils}/bin/arecord@g' util/mma-splitrec.py sed -i 's@/usr/bin/timidity@/${timidity}/bin/timidity@g' mma-splitrec sed -i 's@/usr/bin/timidity@/${timidity}/bin/timidity@g' util/mma-splitrec.py - find . -type f | xargs sed -i 's@/usr/bin/env python@${python}/bin/python@g' + find . -type f | xargs sed -i 's@/usr/bin/env python@${python3.interpreter}@g' ''; installPhase = '' diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 40ae38fda5c21..01d7befddd674 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.23.0"; + version = "3.23.2"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1zhd82mzbzc9jx7xhglgq0giyy214ypq1rw5kmhp5zswv71hf2j0"; + sha256 = "1zf4ck19z3nh1x9a847ay1qnkyvi6s6866kp6q6dh1xpn7i9rmx7"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix index 0ee63c2048517..f4b799f552077 100644 --- a/pkgs/applications/audio/pulseeffects/default.nix +++ b/pkgs/applications/audio/pulseeffects/default.nix @@ -42,13 +42,13 @@ let ]; in stdenv.mkDerivation rec { name = "pulseeffects-${version}"; - version = "4.2.3"; + version = "4.2.6"; src = fetchFromGitHub { owner = "wwmm"; repo = "pulseeffects"; rev = "v${version}"; - sha256 = "0s3lc0xkr48wzk0b6akq4yw19n0iwfi9jyji8bpdgj5y7kjg5mqm"; + sha256 = "1b5h760bb1wgn4avirjjri5fcfqvnsr076qnhrdiqcic3vgircsm"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/applications/audio/setbfree/default.nix index 4d8435454239f..905de343117d2 100644 --- a/pkgs/applications/audio/setbfree/default.nix +++ b/pkgs/applications/audio/setbfree/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "setbfree-${version}"; - version = "0.8.5"; + version = "0.8.7"; src = fetchurl { url = "https://github.com/pantherb/setBfree/archive/v${version}.tar.gz"; - sha256 = "0qfccny0hh9lq54272mzmxvfz2jmzcgigjkjwn6v9h6n00gi5bw4"; + sha256 = "07s320r67cz0cdjdsbcwn0fw3xs0wz7lgrybqpws2skvkbls228q"; }; patchPhase = '' diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index 3540869f36169..cb581bc830335 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -3,12 +3,12 @@ , libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }: stdenv.mkDerivation rec { - version = "20180320"; + version = "20180803"; name = "x42-plugins-${version}"; src = fetchurl { url = "https://gareus.org/misc/x42-plugins/${name}.tar.xz"; - sha256 = "167ly9nxqq3g0j35i9jv9rvd8qp4i9ncfcjxmg972cp6q8ak8mdl"; + sha256 = "1v7p6vnkcbzyvmcysabhmn603cndzx9mwzaw5dppy4wd687vhgis"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index 5e583049190c2..c9fd4f9c4ab9a 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -62,5 +62,6 @@ in mkDerivation rec { homepage = https://github.com/sddm/sddm; maintainers = with maintainers; [ abbradar ttuegel ]; platforms = platforms.linux; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix index 12e3dad9c79c1..e504c09e43e6b 100644 --- a/pkgs/applications/display-managers/slim/default.nix +++ b/pkgs/applications/display-managers/slim/default.nix @@ -50,5 +50,6 @@ stdenv.mkDerivation rec { meta = { homepage = https://sourceforge.net/projects/slim.berlios/; # berlios shut down; I found no replacement yet platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/editors/gobby/default.nix b/pkgs/applications/editors/gobby/default.nix index faad4bfe72bb7..e59def88de55d 100644 --- a/pkgs/applications/editors/gobby/default.nix +++ b/pkgs/applications/editors/gobby/default.nix @@ -1,23 +1,22 @@ { avahiSupport ? false # build support for Avahi in libinfinity -, gnomeSupport ? false # build support for Gnome(gnome-vfs) -, stdenv, fetchurl, pkgconfig -, gtkmm2, gsasl, gtksourceview, libxmlxx, libinfinity, intltool -, gnome_vfs ? null}: +, stdenv, fetchurl, fetchFromGitHub, autoconf, automake, pkgconfig, wrapGAppsHook +, gtkmm3, gsasl, gtksourceview3, libxmlxx, libinfinity, intltool, itstool, gnome3 }: let libinf = libinfinity.override { gtkWidgets = true; inherit avahiSupport; }; - in stdenv.mkDerivation rec { - - name = "gobby-0.5.0"; - src = fetchurl { - url = "http://releases.0x539.de/gobby/${name}.tar.gz"; - sha256 = "165x0r668ma5blziisvbr8qig3jw9hf7i6w8r7wwvz3wsac3bswc"; + name = "gobby-unstable-2018-04-03"; + src = fetchFromGitHub { + owner = "gobby"; + repo = "gobby"; + rev = "ea4df27c9b6b885434797b0071ce198b23f9f63b"; + sha256 = "0q7lq64yn16lxvj4jphs8y9194h0xppj8k7y9x8b276krraak2az"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtkmm2 gsasl gtksourceview libxmlxx libinf intltool ] - ++ stdenv.lib.optional gnomeSupport gnome_vfs; + nativeBuildInputs = [ autoconf automake pkgconfig intltool itstool gnome3.yelp-tools wrapGAppsHook ]; + buildInputs = [ gtkmm3 gsasl gtksourceview3 libxmlxx libinf ]; + + preConfigure = "./autogen.sh"; meta = with stdenv.lib; { homepage = http://gobby.0x539.de/; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index d77f8f2e7a6a6..676514a614a6a 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -249,12 +249,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2018.2"; /* updated by script */ + version = "2018.2.1"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "08kjlmldnd6rnk8m12klfp9vbkbvcsgaknpi55r248nzglnbx9gz"; /* updated by script */ + sha256 = "16fr5760nkzgx8785x6hh7s96x097y6vdx7w1f9ipg71vv25cscq"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -262,12 +262,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2018.2"; /* updated by script */ + version = "2018.2.1"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "1byf46vni8s6qf3wlsnscxipgndl6ic48nizwiaqasnhhszqssxs"; /* updated by script */ + sha256 = "1jfkxr790wr8ffn7ph694hfzahs2akjcfk4rfsvjv1dccqb0167k"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip 2018.2"; @@ -275,12 +275,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2018.2"; /* updated by script */ + version = "2018.2.1"; /* updated by script */ description = "Up and Coming Go IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "0z7a06892c3hcq5zxvkfnyf0ablwq51710x1f12v6r297l4mfra0"; /* updated by script */ + sha256 = "0k96v00cbxkgxs9xby5m4dxl4w2kkm2lii54z1hqjwqmc9kxa2ia"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand Release"; @@ -288,12 +288,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2018.2"; /* updated by script */ + version = "2018.2.1"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "0r5fsai77w74vhfs449yff56pi4vynl8w25amn23k6hddlqxph2s"; /* updated by script */ + sha256 = "04dqyzkkrwvcdy1raard77v2315d44h29cpc9p98bjidvjd6bhsx"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA Release"; @@ -301,12 +301,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2018.2"; /* updated by script */ + version = "2018.2.1"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz"; - sha256 = "1xq97dcf7xcs8fsrjsqqrzxf2gnrll8bbqkzrpg85bqxap0hvb45"; /* updated by script */ + sha256 = "0ydidg9pk8bqf5jb1z0fw2m88v6mi38b4ddgmh5c9d9p44g6mddv"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA Release"; @@ -314,12 +314,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2018.2"; /* updated by script */ + version = "2018.2.1"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "15czwk15c1gnf7xrgm423xafsw55083dd6g15g69zs0l9psrss31"; /* updated by script */ + sha256 = "042qhdkl4v5q4cdbqfbiwj6s3acivdb5kmbyn4jix8pg8r37yfnm"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm 2018.2"; @@ -327,12 +327,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2018.2"; /* updated by script */ + version = "2018.2.1"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0a5dsr2piw0vgm9lvc2k18sdnvii55xdyi90z95hzg5syhsm1a94"; /* updated by script */ + sha256 = "14vnwqk0x0anvzmdv2ddc3qc9g5fll2ql02mi12k425j30fl2z2q"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm Release"; @@ -340,12 +340,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2018.2"; /* updated by script */ + version = "2018.2.1"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0azjrbxpwank09i7riflbkgrgm23f0q6hgisca6d14ldcbr933aj"; /* updated by script */ + sha256 = "1h4f9l577w2ps0y79x79yhpbrsv3j5nwr1lr1890phmp6zri6wyf"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm Release"; @@ -366,12 +366,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2018.2"; /* updated by script */ + version = "2018.2.1"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "0la83cqf3aknrc62ddpij0gg50rws5l2g4iasyrvfhn4wnmj6n4q"; /* updated by script */ + sha256 = "1gwcadjgs4cw5i3h1xn92ng415vzr5cxyrpgckr1qy37d5f4bhqg"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine 2018.2"; @@ -379,12 +379,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2018.2"; /* updated by script */ + version = "2018.2.1"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "024schngx26ik8cvmkijfzzmpkajckl2dbyz31ajnmixpn07pwi6"; /* updated by script */ + sha256 = "1jbzkp13qn4n58kbcsszm2gfnywjma2yvn48g0vi14v7x6zihhxd"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm Release"; diff --git a/pkgs/applications/editors/nedit/default.nix b/pkgs/applications/editors/nedit/default.nix index 39d96775ebcd2..6fff6df8cdda7 100644 --- a/pkgs/applications/editors/nedit/default.nix +++ b/pkgs/applications/editors/nedit/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://sourceforge.net/projects/nedit; platforms = with platforms; linux ++ darwin; + license = licenses.gpl2; }; } diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix index a6f454deaf5c7..ef0d98455f278 100644 --- a/pkgs/applications/editors/sigil/default.nix +++ b/pkgs/applications/editors/sigil/default.nix @@ -6,10 +6,10 @@ stdenv.mkDerivation rec { name = "sigil-${version}"; - version = "0.9.9"; + version = "0.9.10"; src = fetchFromGitHub { - sha256 = "01pvc7k54mx5c7h1qiw92d4j459psv7n9xg94qbinf8vmpvkrcbw"; + sha256 = "11r7043kbqv67z1aqk929scsg6yllldpl8icl32dw3dai7f1c658"; rev = version; repo = "Sigil"; owner = "Sigil-Ebook"; diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 81b5be7dd2ba7..3711b3cdcee44 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -154,6 +154,10 @@ in stdenv.mkDerivation rec { ln -sfn '${nixosRuntimepath}' "$out"/share/vim/vimrc '' + stdenv.lib.optionalString wrapPythonDrv '' wrapProgram "$out/bin/vim" --prefix PATH : "${python}/bin" + '' + stdenv.lib.optionalString (guiSupport == "gtk3") '' + rm "$out/bin/gvim" + echo -e '#!${stdenv.shell}\n"'"$out/bin/vim"'" -g "$@"' > "$out/bin/gvim" + chmod a+x "$out/bin/gvim" ''; preInstall = '' diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/applications/graphics/dosage/default.nix index 69d09cd429c12..d45d6c3a62e39 100644 --- a/pkgs/applications/graphics/dosage/default.nix +++ b/pkgs/applications/graphics/dosage/default.nix @@ -1,4 +1,4 @@ -{ pythonPackages, fetchFromGitHub }: +{ stdenv, pythonPackages, fetchFromGitHub }: pythonPackages.buildPythonApplication rec { pname = "dosage"; @@ -23,5 +23,6 @@ pythonPackages.buildPythonApplication rec { meta = { description = "A comic strip downloader and archiver"; homepage = https://dosage.rocks/; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/applications/graphics/jbrout/default.nix b/pkgs/applications/graphics/jbrout/default.nix index f120f8b13d405..9c81fe32b5132 100644 --- a/pkgs/applications/graphics/jbrout/default.nix +++ b/pkgs/applications/graphics/jbrout/default.nix @@ -37,5 +37,6 @@ in pythonPackages.buildPythonApplication rec { homepage = http://manatlan.com/jbrout/; description = "Photo manager"; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 0a98f387ff861..15d894b0413db 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "3.28.0"; + version = "3.29.0"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "0b3vv03c6m6972sk8zj3zc5sq6b9837irnfgjlqhv9z5i75m0414"; + sha256 = "1r29vi8j51r0nnzpjbg34ryvizzkn31sq1iz7z748wjfgr87wmyh"; }; patches = [ diff --git a/pkgs/applications/misc/cointop/default.nix b/pkgs/applications/misc/cointop/default.nix index 2ac335759ce46..23d76afff0cef 100644 --- a/pkgs/applications/misc/cointop/default.nix +++ b/pkgs/applications/misc/cointop/default.nix @@ -26,5 +26,6 @@ buildGoPackage rec { homepage = https://cointop.sh; platforms = stdenv.lib.platforms.linux; # cannot test others maintainers = [ ]; + license = stdenv.lib.licenses.asl20; }; } diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index fd14bba282c45..b8eff972ebdd6 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "dbeaver-ce-${version}"; - version = "5.1.4"; + version = "5.1.5"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "14i7b3l89rkhqq4zgsdbvcs9pp60djv0rjbm86fpk2wi4zkrlzi5"; + sha256 = "17ai2gxnz1wj5m282sib9qhvy3665km2ig1ixxdklmk8apgdl1xr"; }; installPhase = '' diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index 7aee6cb708166..e9d1946660944 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation { platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.peti ]; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/misc/gutenberg/default.nix b/pkgs/applications/misc/gutenberg/default.nix index 186475e2cd591..c5982f68201da 100644 --- a/pkgs/applications/misc/gutenberg/default.nix +++ b/pkgs/applications/misc/gutenberg/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "gutenberg-${version}"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "Keats"; repo = "gutenberg"; rev = "v${version}"; - sha256 = "1i2jcyq6afswxyjifhl5irv84licsad7c83yiy17454mplvrmyg2"; + sha256 = "0is7156aim2ad8xg2f5068crc4gfvm89x8gxa25vc25p0yr1bpla"; }; - cargoSha256 = "0hzxwvb5m8mvpfxys4ikkaag6khflh5bfglmay11wf6ayighv834"; + cargoSha256 = "146vlr85n9d06am5ki76fh1vb5r8a4lzx5b7dmgi292kc3dsn41z"; nativeBuildInputs = [ cmake pkgconfig openssl ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices cf-private ]; diff --git a/pkgs/applications/misc/img2pdf/default.nix b/pkgs/applications/misc/img2pdf/default.nix new file mode 100644 index 0000000000000..9b6ac086efdf5 --- /dev/null +++ b/pkgs/applications/misc/img2pdf/default.nix @@ -0,0 +1,27 @@ +{ stdenv, python3Packages }: + +with python3Packages; + +buildPythonApplication rec { + pname = "img2pdf"; + version = "0.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "071s3gf28nb8ifxkix7dzjny6vib7791mnp0v3f4zagcjcic22a4"; + }; + + doCheck = false; # needs pdfrw + + propagatedBuildInputs = [ + pillow + ]; + + meta = with stdenv.lib; { + description = "Convert images to PDF via direct JPEG inclusion"; + homepage = https://gitlab.mister-muffin.de/josch/img2pdf; + license = licenses.lgpl2; + platforms = platforms.unix; + maintainers = [ maintainers.veprbl ]; + }; +} diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 9872ff23f3479..e753c5ded95cb 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "josm-${version}"; - version = "14026"; + version = "14066"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "1ysi23j2yj5b6cn3xdsrl4xp56klpw4xa7c4gv90z2dllx06mqli"; + sha256 = "06mhaz5vr19ydqc5irhgcbl0s8fifwvaq60iz2nsnlxb1pw89xia"; }; buildInputs = [ jre10 makeWrapper ]; diff --git a/pkgs/applications/misc/keepass-plugins/keeagent/default.nix b/pkgs/applications/misc/keepass-plugins/keeagent/default.nix index cd83d2a44e1d3..80bf5deceb160 100644 --- a/pkgs/applications/misc/keepass-plugins/keeagent/default.nix +++ b/pkgs/applications/misc/keepass-plugins/keeagent/default.nix @@ -1,19 +1,19 @@ { stdenv, buildEnv, fetchzip, mono }: let - version = "0.8.1"; + version = "0.10.1"; drv = stdenv.mkDerivation { name = "keeagent-${version}"; src = fetchzip { - url = http://lechnology.com/wp-content/uploads/2016/07/KeeAgent_v0.8.1.zip; - sha256 = "16x1qrnzg0xkvi7w29wj3z0ldmql2vcbwxksbsmnidzmygwg98hk"; + url = "https://lechnology.com/wp-content/uploads/2018/04/KeeAgent_v0.10.1.zip"; + sha256 = "0j7az6l9wcr8z66mfplkxwydd4bgz2p2vd69xncf0nxlfb0lshh7"; stripRoot = false; }; meta = { description = "KeePass plugin to allow other programs to access SSH keys stored in a KeePass database for authentication"; - homepage = http://lechnology.com/software/keeagent; + homepage = "http://lechnology.com/software/keeagent"; platforms = with stdenv.lib.platforms; linux; license = stdenv.lib.licenses.gpl2; maintainers = [ ]; diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix index eafe0b9b5c641..c22c014bf5f57 100644 --- a/pkgs/applications/misc/latte-dock/default.nix +++ b/pkgs/applications/misc/latte-dock/default.nix @@ -1,28 +1,31 @@ -{ mkDerivation, lib, cmake, xorg, plasma-framework, fetchFromGitHub -, extra-cmake-modules, karchive, kwindowsystem, qtx11extras, kcrash }: +{ mkDerivation, lib, cmake, xorg, plasma-framework, fetchurl +, extra-cmake-modules, karchive, kwindowsystem, qtx11extras, kcrash, knewstuff }: -let version = "0.7.5"; in +mkDerivation rec { + pname = "latte-dock"; + version = "0.8.0"; + name = "${pname}-${version}"; -mkDerivation { - name = "latte-dock-${version}"; - - src = fetchFromGitHub { - owner = "psifidotos"; - repo = "Latte-Dock"; - rev = "v${version}"; - sha256 = "0fblbx6qk4miag1mhiyns7idsw03p9pj3xc3xxxnb5rpj1fy0ifv"; + src = fetchurl { + url = "https://download.kde.org/stable/${pname}/${name}.tar.xz"; + sha256 = "1zg9r162r66vcvj5rzgy61mda89sk5yfy96g5p1aahbim0rgbdbs"; + name = "${name}.tar.xz"; }; buildInputs = [ plasma-framework xorg.libpthreadstubs xorg.libXdmcp xorg.libSM ]; nativeBuildInputs = [ extra-cmake-modules cmake karchive kwindowsystem - qtx11extras kcrash ]; + qtx11extras kcrash knewstuff ]; + + meta = with lib; { description = "Dock-style app launcher based on Plasma frameworks"; homepage = https://github.com/psifidotos/Latte-Dock; license = licenses.gpl2; platforms = platforms.unix; - maintainers = [ maintainers.benley ]; + maintainers = [ maintainers.benley maintainers.ysndr ]; }; + + } diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix index 943f36a57acdc..3155ab678d868 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -1,35 +1,41 @@ -{ stdenv, fetchurl, sane-backends, qtbase, qtsvg, autoPatchelfHook }: +{ stdenv, fetchurl, sane-backends, qtbase, qtsvg, nss, autoPatchelfHook }: + let - version = "4.3.89"; + version = "5.1.12"; + in stdenv.mkDerivation { name = "masterpdfeditor-${version}"; + src = fetchurl { url = "https://code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz"; - sha256 = "0k5bzlhqglskiiq86nmy18mnh5bf2w3mr9cq3pibrwn5pisxnxxc"; + sha256 = "1i3pdrhnlj06phm36gs42s6b94pigcfb8wa5dhmplxn0dqp434hq"; }; nativeBuildInputs = [ autoPatchelfHook ]; - buildInputs = [ sane-backends qtbase qtsvg ]; + buildInputs = [ nss qtbase qtsvg sane-backends stdenv.cc.cc ]; dontStrip = true; installPhase = '' - p=$out/opt/masterpdfeditor - mkdir -p $out/bin $p $out/share/applications $out/share/pixmaps + runHook preInstall + + p=$out/opt/masterpdfeditor + mkdir -p $out/bin - substituteInPlace masterpdfeditor4.desktop \ - --replace 'Exec=/opt/master-pdf-editor-4' "Exec=$out/bin" \ - --replace 'Path=/opt/master-pdf-editor-4' "Path=$out/bin" \ - --replace 'Icon=/opt/master-pdf-editor-4' "Icon=$out/share/pixmaps" - cp -v masterpdfeditor4.png $out/share/pixmaps/ - cp -v masterpdfeditor4.desktop $out/share/applications + substituteInPlace masterpdfeditor5.desktop \ + --replace 'Exec=/opt/master-pdf-editor-5' "Exec=$out/bin" \ + --replace 'Path=/opt/master-pdf-editor-5' "Path=$out/bin" \ + --replace 'Icon=/opt/master-pdf-editor-5' "Icon=$out/share/pixmaps" - cp -v masterpdfeditor4 $p/ - ln -s $p/masterpdfeditor4 $out/bin/masterpdfeditor4 - cp -v -r stamps templates lang fonts $p + install -Dm644 -t $out/share/pixmaps masterpdfeditor5.png + install -Dm644 -t $out/share/applications masterpdfeditor5.desktop + install -Dm755 -t $p masterpdfeditor5 + install -Dm644 license.txt $out/share/$name/LICENSE + ln -s $p/masterpdfeditor5 $out/bin/masterpdfeditor5 + cp -v -r stamps templates lang fonts $p - install -D license.txt $out/share/$name/LICENSE + runHook postInstall ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/mdp/default.nix b/pkgs/applications/misc/mdp/default.nix index fd0a8ea1fe4e5..5af524a456bab 100644 --- a/pkgs/applications/misc/mdp/default.nix +++ b/pkgs/applications/misc/mdp/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - version = "1.0.12"; + version = "1.0.13"; name = "mdp-${version}"; src = fetchFromGitHub { owner = "visit1985"; repo = "mdp"; rev = version; - sha256 = "04izj9i9rxmgswjh2iawqs6qglfv44zfv042smmcvfh1pm43361i"; + sha256 = "0snmglsmgfavgv6cnlb0j54sr0paf570ajpwk1b3g81v078hz2aq"; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/misc/memo/default.nix b/pkgs/applications/misc/memo/default.nix index 072ea7e42dc5c..c112cf0c928f0 100644 --- a/pkgs/applications/misc/memo/default.nix +++ b/pkgs/applications/misc/memo/default.nix @@ -1,4 +1,5 @@ { fetchFromGitHub, silver-searcher, tree, man, stdenv, + git, pandocSupport ? true, pandoc ? null , ... }: @@ -8,13 +9,13 @@ stdenv.mkDerivation rec { name = "memo-${version}"; - version = "0.5"; + version = "0.6"; src = fetchFromGitHub { owner = "mrVanDalo"; repo = "memo"; rev = "${version}"; - sha256 = "1kq8hmq4lgvkk717nhmdryr90g61xm0jm7y8dzya8jsxsn531gm8"; + sha256 = "1cvjs36f6vxzfz5d63yhyw8j7gdw5hn6cfzccf7ag08lamjhfhbr"; }; installPhase = let @@ -28,6 +29,7 @@ stdenv.mkDerivation rec { --replace "ack_cmd=ack" "ack_cmd=${silver-searcher}/bin/ag" \ --replace "tree_cmd=tree" "tree_cmd=${tree}/bin/tree" \ --replace "man_cmd=man" "man_cmd=${man}/bin/man" \ + --replace "git_cmd=git" "git_cmd=${git}/bin/git" \ --replace "pandoc_cmd=pandoc" "${pandocReplacement}" mv memo $out/bin/ mv doc/memo.1 $out/share/man/man1/memo.1 diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index 76517f8746422..7068d8aedd376 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -1,118 +1,95 @@ -{ stdenv, fetchurl, makeWrapper, cmake, pkgconfig -, glibc, gnome-keyring, gtk, gtkmm, pcre, swig, sudo -, mysql, libxml2, libctemplate, libmysqlconnectorcpp -, vsqlite, tinyxml, gdal, libiodbc, libpthreadstubs -, libXdmcp, libuuid, libzip, libgnome-keyring, file -, pythonPackages, jre, autoconf, automake, libtool -, boost, glibmm, libsigcxx, pangomm, libX11, openssl -, proj, cairo, libglade +{ stdenv, fetchurl, substituteAll, cmake, ninja, pkgconfig +, glibc, gtk3, gtkmm3, pcre, swig, antlr4_7, sudo +, mysql, libxml2, libmysqlconnectorcpp +, vsqlite, gdal, libiodbc, libpthreadstubs +, libXdmcp, libuuid, libzip, libsecret, libssh +, python2, jre +, boost, libsigcxx, libX11, openssl +, proj, cairo, libxkbcommon, epoxy, wrapGAppsHook +, at-spi2-core, dbus, bash, coreutils }: let - inherit (pythonPackages) pexpect pycrypto python paramiko; + inherit (python2.pkgs) paramiko pycairo pyodbc; in stdenv.mkDerivation rec { pname = "mysql-workbench"; - version = "6.3.8"; + version = "8.0.12"; name = "${pname}-${version}"; src = fetchurl { url = "http://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz"; - sha256 = "1bxd828nrawmym6d8awh1vrni8dsbwh1k5am1lrq5ihp5c3kw9ka"; + sha256 = "0d6k1kw0bi3q5dlilzlgds1gcrlf7pis4asm3d6pssh2jmn5hh82"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake gnome-keyring gtk gtk.dev gtkmm pcre swig python sudo - paramiko mysql libxml2 libctemplate libmysqlconnectorcpp vsqlite tinyxml gdal libiodbc file - libpthreadstubs libXdmcp libuuid libzip libgnome-keyring libgnome-keyring.dev jre autoconf - automake libtool boost glibmm glibmm.dev libsigcxx pangomm libX11 pexpect pycrypto openssl - proj cairo cairo.dev makeWrapper libglade ] ; - - prePatch = '' - for f in backend/wbpublic/{grt/spatial_handler.h,grtui/geom_draw_box.h,objimpl/db.query/db_query_Resultset.cpp} ; - do - sed -i 's@#include <gdal/@#include <@' $f ; - done + patches = [ + ./fix-gdal-includes.patch + (substituteAll { + src = ./hardcode-paths.patch; + catchsegv = "${glibc.bin}/bin/catchsegv"; + bash = "${bash}/bin/bash"; + cp = "${coreutils}/bin/cp"; + dd = "${coreutils}/bin/dd"; + ls = "${coreutils}/bin/ls"; + mkdir = "${coreutils}/bin/mkdir"; + nohup = "${coreutils}/bin/nohup"; + rm = "${coreutils}/bin/rm"; + rmdir = "${coreutils}/bin/rmdir"; + sudo = "${sudo}/bin/sudo"; + }) + ]; - sed -i '32s@mysqlparser@mysqlparser sqlparser@' library/mysql.parser/CMakeLists.txt + nativeBuildInputs = [ + cmake ninja pkgconfig jre swig wrapGAppsHook + ]; - cat <<EOF > ext/antlr-runtime/fix-configure - #!${stdenv.shell} - echo "fixing bundled antlr3c configure" ; - sed -i 's@/usr/bin/file@${file}/bin/file@' configure - sed -i '12121d' configure - EOF - chmod +x ext/antlr-runtime/fix-configure - sed -i '236s@&&@& ''${PROJECT_SOURCE_DIR}/ext/antlr-runtime/fix-configure &@' CMakeLists.txt + buildInputs = [ + gtk3 gtkmm3 libX11 antlr4_7.runtime.cpp python2 mysql libxml2 + libmysqlconnectorcpp vsqlite gdal boost libssh openssl + libiodbc pcre cairo libuuid libzip libsecret + libsigcxx proj + # python dependencies: + paramiko pycairo pyodbc # sqlanydb + # transitive dependencies: + libpthreadstubs libXdmcp libxkbcommon epoxy at-spi2-core dbus + ]; - substituteInPlace $(pwd)/frontend/linux/workbench/mysql-workbench.in --replace "catchsegv" "${glibc.bin}/bin/catchsegv" - substituteInPlace $(pwd)/frontend/linux/workbench/mysql-workbench.in --replace "/usr/lib/x86_64-linux-gnu" "${proj}/lib" - patchShebangs $(pwd)/library/mysql.parser/grammar/build-parser - patchShebangs $(pwd)/tools/get_wb_version.sh + postPatch = '' + patchShebangs tools/get_wb_version.sh ''; NIX_CFLAGS_COMPILE = [ - "-I${libsigcxx}/lib/sigc++-2.0/include" - "-I${pangomm}/lib/pangomm-1.4/include" - "-I${glibmm}/lib/giomm-2.4/include" + # error: 'OGRErr OGRSpatialReference::importFromWkt(char**)' is deprecated + "-Wno-error=deprecated-declarations" ]; cmakeFlags = [ - "-DCMAKE_CXX_FLAGS=-std=c++11" "-DMySQL_CONFIG_PATH=${mysql}/bin/mysql_config" - "-DCTemplate_INCLUDE_DIR=${libctemplate}/include" - "-DCAIRO_INCLUDE_DIRS=${cairo.dev}/include" - "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk}/lib/gtk-2.0/include" - "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${gtk.dev}/include" - "-DGTK2_GTKMMCONFIG_INCLUDE_DIR=${gtkmm}/lib/gtkmm-2.4/include" - "-DGTK2_GDKMMCONFIG_INCLUDE_DIR=${gtkmm}/lib/gdkmm-2.4/include" - "-DGTK2_GLIBMMCONFIG_INCLUDE_DIR=${glibmm}/lib/glibmm-2.4/include" + "-DIODBC_CONFIG_PATH=${libiodbc}/bin/iodbc-config" + "-DWITH_ANTLR_JAR=${antlr4_7.jarLocation}" ]; - postInstall = '' - patchShebangs $out/share/mysql-workbench/extras/build_freetds.sh - - for i in $out/lib/mysql-workbench/modules/wb_utils_grt.py \ - $out/lib/mysql-workbench/modules/wb_server_management.py \ - $out/lib/mysql-workbench/modules/wb_admin_grt.py; do - substituteInPlace $i \ - --replace "/bin/bash" ${stdenv.shell} \ - --replace "/usr/bin/sudo" ${sudo}/bin/sudo - done + # There is already an executable and a wrapper in bindir + # No need to wrap both + dontWrapGApps = true; - wrapProgram "$out/bin/mysql-workbench" \ - --prefix LD_LIBRARY_PATH : "${python}/lib" \ - --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.cc}/nix-support/orig-cc)/lib64" \ - --prefix PATH : "${gnome-keyring}/bin" \ - --prefix PATH : "${python}/bin" \ - --set PYTHONPATH $PYTHONPATH \ - --run ' -# The gnome-keyring-daemon must be running. To allow for environments like -# kde, xfce where this is not so, we start it first. -# It is cleaned up using a supervisor subshell which detects that -# the parent has finished via the closed pipe as terminate signal idiom, -# used because we cannot clean up after ourselves due to the exec call. - -# Start gnome-keyring-daemon, export the environment variables it asks us to set. -for expr in $( gnome-keyring-daemon --start ) ; do eval "export "$expr ; done - -# Prepare fifo pipe. -FIFOCTL="/tmp/gnome-keyring-daemon-ctl.$$.fifo" -[ -p $FIFOCTL ] && rm $FIFOCTL -mkfifo $FIFOCTL - -# Supervisor subshell waits reading from pipe, will receive EOF when parent -# closes pipe on termination. Negate read with ! operator to avoid subshell -# quitting when read EOF returns 1 due to -e option being set. -( - exec 19< $FIFOCTL - ! read -u 19 - - kill $GNOME_KEYRING_PID - rm $FIFOCTL -) & + preFixup = '' + gappsWrapperArgs+=( + --prefix PATH : "${python2}/bin" + --prefix PROJSO : "${proj}/lib/libproj.so" + --set PYTHONPATH $PYTHONPATH + ) + ''; -exec 19> $FIFOCTL - ' + # Let’s wrap the programs not ending with bin + # until https://bugs.mysql.com/bug.php?id=91948 is fixed + postFixup = '' + find -L "$out/bin" -type f -executable -print0 \ + | while IFS= read -r -d ''' file; do + if [[ "''${file}" != *-bin ]]; then + echo "Wrapping program ''${file}" + wrapProgram "''${file}" "''${gappsWrapperArgs[@]}" + fi + done ''; meta = with stdenv.lib; { @@ -127,6 +104,6 @@ exec 19> $FIFOCTL homepage = http://wb.mysql.com/; license = licenses.gpl2; maintainers = [ maintainers.kkallio ]; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/mysql-workbench/fix-gdal-includes.patch b/pkgs/applications/misc/mysql-workbench/fix-gdal-includes.patch new file mode 100644 index 0000000000000..0a5c31fd40a27 --- /dev/null +++ b/pkgs/applications/misc/mysql-workbench/fix-gdal-includes.patch @@ -0,0 +1,47 @@ +--- a/backend/wbpublic/grt/spatial_handler.h ++++ b/backend/wbpublic/grt/spatial_handler.h +@@ -24,12 +24,12 @@ + #ifndef SPATIAL_HANDLER_H_ + #define SPATIAL_HANDLER_H_ + +-#include <gdal/ogrsf_frmts.h> +-#include <gdal/ogr_api.h> +-#include <gdal/gdal_pam.h> +-#include <gdal/memdataset.h> +-#include <gdal/gdal_alg.h> +-#include <gdal/gdal.h> ++#include <ogrsf_frmts.h> ++#include <ogr_api.h> ++#include <gdal_pam.h> ++#include <memdataset.h> ++#include <gdal_alg.h> ++#include <gdal.h> + #include <deque> + #include "base/geometry.h" + #include "wbpublic_public_interface.h" +--- a/backend/wbpublic/grtui/geom_draw_box.h ++++ b/backend/wbpublic/grtui/geom_draw_box.h +@@ -25,7 +25,7 @@ + #define _GEOM_DRAW_BOX_H_ + + #include <mforms/drawbox.h> +-#include <gdal/ogr_geometry.h> ++#include <ogr_geometry.h> + #include "wbpublic_public_interface.h" + + class WBPUBLICBACKEND_PUBLIC_FUNC GeomDrawBox : public mforms::DrawBox { +--- a/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp ++++ b/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp +@@ -21,9 +21,9 @@ + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +-#include <gdal/ogrsf_frmts.h> +-#include <gdal/ogr_api.h> +-#include <gdal/gdal.h> ++#include <ogrsf_frmts.h> ++#include <ogr_api.h> ++#include <gdal.h> + + #include <grts/structs.db.query.h> + #include <grtpp_util.h> diff --git a/pkgs/applications/misc/mysql-workbench/hardcode-paths.patch b/pkgs/applications/misc/mysql-workbench/hardcode-paths.patch new file mode 100644 index 0000000000000..dddf992e4c120 --- /dev/null +++ b/pkgs/applications/misc/mysql-workbench/hardcode-paths.patch @@ -0,0 +1,187 @@ +--- a/frontend/linux/workbench/mysql-workbench.in ++++ b/frontend/linux/workbench/mysql-workbench.in +@@ -99,8 +99,8 @@ + if test "$WB_DEBUG" != ""; then + $WB_DEBUG $MWB_BINARIES_DIR/mysql-workbench-bin "$@" + else +- if type -p catchsegv > /dev/null; then +- catchsegv $MWB_BINARIES_DIR/mysql-workbench-bin "$@" ++ if type -p @catchsegv@ > /dev/null; then ++ @catchsegv@ $MWB_BINARIES_DIR/mysql-workbench-bin "$@" + else + $MWB_BINARIES_DIR/mysql-workbench-bin "$@" + fi +--- a/plugins/migration/frontend/migration_bulk_copy_data.py ++++ b/plugins/migration/frontend/migration_bulk_copy_data.py +@@ -110,7 +110,7 @@ + return 'sh' + + def generate_import_script(self, connection_args, path_to_file, schema_name): +- output = ['#!/bin/bash'] ++ output = ['#!/usr/bin/env bash'] + output.append('MYPATH=\`pwd\`') + + output.append('if [ -f \$MYPATH/%s ] ; then' % self.error_log_name) +@@ -164,7 +164,7 @@ + return 'sh' + + def generate_import_script(self, connection_args, path_to_file, schema_name): +- output = ['#!/bin/bash'] ++ output = ['#!/usr/bin/env bash'] + output.append('MYPATH=\`pwd\`') + + output.append('if [ -f \$MYPATH/%s ] ; then' % self.error_log_name) +@@ -417,7 +417,7 @@ + + with open(script_path, 'w+') as f: + os.chmod(script_path, 0700) +- f.write('#!/bin/bash\n\n') ++ f.write('#!/usr/bin/env bash\n\n') + f.write('MYPATH=`pwd`\n') + + f.write("arg_source_password=\"<put source password here>\"\n") +@@ -521,7 +521,7 @@ + + with open(script_path, 'w+') as f: + os.chmod(script_path, 0700) +- f.write('#!/bin/bash\n\n') ++ f.write('#!/usr/bin/env bash\n\n') + f.write('MYPATH=`pwd`\n') + + f.write("arg_source_password=\"<put source password here>\"\n") +--- a/plugins/wb.admin/backend/wb_server_control.py ++++ b/plugins/wb.admin/backend/wb_server_control.py +@@ -39,7 +39,7 @@ + + UnixVariant = { + "" : { +- 'sudo_command' : "/usr/bin/sudo -k -S -p EnterPasswordHere ", ++ 'sudo_command' : "@sudo@ -k -S -p EnterPasswordHere ", + } + } + +--- a/plugins/wb.admin/backend/wb_server_management.py ++++ b/plugins/wb.admin/backend/wb_server_management.py +@@ -40,7 +40,7 @@ + + def reset_sudo_prefix(): + global default_sudo_prefix +- default_sudo_prefix = '/usr/bin/sudo -k -S -p EnterPasswordHere' ++ default_sudo_prefix = '@sudo@ -k -S -p EnterPasswordHere' + + reset_sudo_prefix() + +@@ -100,7 +100,7 @@ + + if to_spawn: + command += ' &' +- sudo_prefix += ' /usr/bin/nohup' ++ sudo_prefix += ' @nohup@' + + # If as_user is the CURRENT then there's no need to sudo + if as_user != Users.CURRENT: +@@ -111,7 +111,7 @@ + if '/bin/sh' in sudo_prefix or '/bin/bash' in sudo_prefix: + command = "LANG=C " + sudo_prefix + " \"" + command.replace('\\', '\\\\').replace('"', r'\"').replace('$','\\$') + "\"" + else: +- command = "LANG=C " + sudo_prefix + " /bin/bash -c \"" + command.replace('\\', '\\\\').replace('"', r'\"').replace('$','\\$') + "\"" ++ command = "LANG=C " + sudo_prefix + " @bash@ -c \"" + command.replace('\\', '\\\\').replace('"', r'\"').replace('$','\\$') + "\"" + + return command + +@@ -896,9 +896,9 @@ + if as_user == Users.CURRENT: + raise PermissionDeniedError("Cannot set owner of directory %s" % path) + else: +- command = "/bin/mkdir %s && chown %s %s" % (quote_path(path), with_owner, quote_path(path)) ++ command = "@mkdir@ %s && chown %s %s" % (quote_path(path), with_owner, quote_path(path)) + else: +- command = "/bin/mkdir %s" % (quote_path(path)) ++ command = "@mkdir@ %s" % (quote_path(path)) + + res = self.process_ops.exec_cmd(command, + as_user = as_user, +@@ -927,7 +927,7 @@ + @useAbsPath("path") + def remove_directory(self, path, as_user = Users.CURRENT, user_password = None): + output = StringIO.StringIO() +- res = self.process_ops.exec_cmd('/bin/rmdir ' + quote_path(path), ++ res = self.process_ops.exec_cmd('@rmdir@ ' + quote_path(path), + as_user = as_user, + user_password = user_password, + output_handler = output.write, +@@ -940,7 +940,7 @@ + @useAbsPath("path") + def remove_directory_recursive(self, path, as_user = Users.CURRENT, user_password = None): + output = StringIO.StringIO() +- res = self.process_ops.exec_cmd('/bin/rm -R ' + quote_path(path), ++ res = self.process_ops.exec_cmd('@rm@ -R ' + quote_path(path), + as_user = as_user, + user_password = user_password, + output_handler = output.write, +@@ -953,7 +953,7 @@ + @useAbsPath("path") + def delete_file(self, path, as_user = Users.CURRENT, user_password = None): + output = StringIO.StringIO() +- res = self.process_ops.exec_cmd("/bin/rm " + quote_path(path), ++ res = self.process_ops.exec_cmd("@rm@ " + quote_path(path), + as_user = as_user, + user_password = user_password, + output_handler = output.write, +@@ -1001,7 +1001,7 @@ + def _copy_file(self, source, dest, as_user = Users.CURRENT, user_password = None): + output = StringIO.StringIO() + +- res = self.process_ops.exec_cmd("LC_ALL=C /bin/cp " + quote_path(source) + " " + quote_path(dest), ++ res = self.process_ops.exec_cmd("LC_ALL=C @cp@ " + quote_path(source) + " " + quote_path(dest), + as_user = as_user, + user_password = user_password, + output_handler = output.write, +@@ -1077,9 +1077,9 @@ + # for ls -l, the output format changes depending on stdout being a terminal or not + # since both cases are possible, we need to handle both at the same time (1st line being total <nnnn> or not) + # the good news is that if the line is there, then it will always start with total, regardless of the locale +- command = 'LC_ALL=C /bin/ls -l -p %s' % quote_path(path) ++ command = 'LC_ALL=C @ls@ -l -p %s' % quote_path(path) + else: +- command = 'LC_ALL=C /bin/ls -1 -p %s' % quote_path(path) ++ command = 'LC_ALL=C @ls@ -1 -p %s' % quote_path(path) + + output = StringIO.StringIO() + res = self.process_ops.exec_cmd(command, +@@ -2160,9 +2160,9 @@ + def get_range(self, start, end): + f = StringIO.StringIO() + if not self._need_sudo: +- ret = self.server_helper.execute_command("/bin/dd if=%s ibs=1 skip=%i count=%i 2> /dev/null" % (quote_path(self.path), start, end-start), as_user = Users.CURRENT, user_password=None, output_handler=f.write) ++ ret = self.server_helper.execute_command("@dd@ if=%s ibs=1 skip=%i count=%i 2> /dev/null" % (quote_path(self.path), start, end-start), as_user = Users.CURRENT, user_password=None, output_handler=f.write) + else: +- ret = self.server_helper.execute_command("/bin/dd if=%s ibs=1 skip=%i count=%i 2> /dev/null" % (quote_path(self.path), start, end-start), as_user = Users.ADMIN, user_password=self.get_password, output_handler=f.write) ++ ret = self.server_helper.execute_command("@dd@ if=%s ibs=1 skip=%i count=%i 2> /dev/null" % (quote_path(self.path), start, end-start), as_user = Users.ADMIN, user_password=self.get_password, output_handler=f.write) + + if ret != 0: + raise RuntimeError("Could not get data from file %s" % self.path) +@@ -2170,9 +2170,9 @@ + + def read_task(self, offset, file): + if not self._need_sudo: +- self.server_helper.execute_command("/bin/dd if=%s ibs=1 skip=%i 2> /dev/null" % (quote_path(self.path), offset), as_user = Users.CURRENT, user_password=None, output_handler=file.write) ++ self.server_helper.execute_command("@dd@ if=%s ibs=1 skip=%i 2> /dev/null" % (quote_path(self.path), offset), as_user = Users.CURRENT, user_password=None, output_handler=file.write) + else: +- self.server_helper.execute_command("/bin/dd if=%s ibs=1 skip=%i 2> /dev/null" % (quote_path(self.path), offset), as_user = Users.ADMIN, user_password=self.get_password, output_handler=file.write) ++ self.server_helper.execute_command("@dd@ if=%s ibs=1 skip=%i 2> /dev/null" % (quote_path(self.path), offset), as_user = Users.ADMIN, user_password=self.get_password, output_handler=file.write) + # this will signal the reader end that there's no more data + file.close() + +@@ -2198,9 +2198,9 @@ + self._pos = offset + f = StringIO.StringIO() + if not self._need_sudo: +- self.server_helper.execute_command("/bin/dd if=%s ibs=1 skip=%i 2> /dev/null" % (quote_path(self.path), offset), as_user = Users.CURRENT, user_password=None, output_handler=f.write) ++ self.server_helper.execute_command("@dd@ if=%s ibs=1 skip=%i 2> /dev/null" % (quote_path(self.path), offset), as_user = Users.CURRENT, user_password=None, output_handler=f.write) + else: +- self.server_helper.execute_command("/bin/dd if=%s ibs=1 skip=%i 2> /dev/null" % (quote_path(self.path), offset), as_user = Users.ADMIN, user_password=self._password, output_handler=f.write) ++ self.server_helper.execute_command("@dd@ if=%s ibs=1 skip=%i 2> /dev/null" % (quote_path(self.path), offset), as_user = Users.ADMIN, user_password=self._password, output_handler=f.write) + self.data = f + self.data.seek(0) + if self.skip_first_newline: diff --git a/pkgs/applications/misc/osmctools/default.nix b/pkgs/applications/misc/osmctools/default.nix index e70be8201b348..bb53782fb7d21 100644 --- a/pkgs/applications/misc/osmctools/default.nix +++ b/pkgs/applications/misc/osmctools/default.nix @@ -42,5 +42,6 @@ stdenv.mkDerivation rec { https://wiki.openstreetmap.org/wiki/Osmfilter ]; platforms = platforms.unix; + license = licenses.agpl3; }; } diff --git a/pkgs/applications/misc/pdfmod/default.nix b/pkgs/applications/misc/pdfmod/default.nix index 2c0d642863ed0..45d83b5872fa3 100644 --- a/pkgs/applications/misc/pdfmod/default.nix +++ b/pkgs/applications/misc/pdfmod/default.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { description = "A simple application for modifying PDF documents"; platforms = platforms.all; maintainers = with maintainers; [ obadz ]; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/applications/misc/pdfshuffler/default.nix b/pkgs/applications/misc/pdfshuffler/default.nix index e06f4407534b6..025ad9cd30a1b 100644 --- a/pkgs/applications/misc/pdfshuffler/default.nix +++ b/pkgs/applications/misc/pdfshuffler/default.nix @@ -36,5 +36,6 @@ python3Packages.buildPythonApplication rec { description = "Merge or split pdf documents and rotate, crop and rearrange their pages"; platforms = platforms.linux; maintainers = with maintainers; [ mic92 ]; + license = licenses.gpl3; }; } diff --git a/pkgs/applications/misc/pgmanage/default.nix b/pkgs/applications/misc/pgmanage/default.nix index a548c149665a1..a17f34378a8b7 100644 --- a/pkgs/applications/misc/pgmanage/default.nix +++ b/pkgs/applications/misc/pgmanage/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pgmanage-${version}"; - version = "10.3.0"; + version = "10.3.1"; src = fetchFromGitHub { owner = "pgManage"; repo = "pgManage"; rev = "v${version}"; - sha256 = "105gmwkifq04qmp5kpgybwjyx01528r6m3x1pxbvnfyni8sf74qj"; + sha256 = "0ym1arla9wfkmr5n6h6dfyd680vlnng5s5j5nyxi2gl2wxqqhxzz"; }; patchPhase = '' diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix index 347b77c7ab4a8..0c358e4221a1a 100644 --- a/pkgs/applications/misc/polybar/default.nix +++ b/pkgs/applications/misc/polybar/default.nix @@ -1,33 +1,36 @@ { cairo, cmake, fetchgit, libXdmcp, libpthreadstubs, libxcb, pcre, pkgconfig -, python2 , stdenv, xcbproto, xcbutil, xcbutilimage, xcbutilrenderutil -, xcbutilwm, xcbutilxrm, makeWrapper +, python2, stdenv, xcbproto, xcbutil, xcbutilcursor, xcbutilimage +, xcbutilrenderutil, xcbutilwm, xcbutilxrm, makeWrapper # optional packages-- override the variables ending in 'Support' to enable or # disable modules , alsaSupport ? true, alsaLib ? null -, iwSupport ? true, wirelesstools ? null , githubSupport ? false, curl ? null , mpdSupport ? false, mpd_clientlib ? null , pulseSupport ? false, libpulseaudio ? null +, iwSupport ? false, wirelesstools ? null +, nlSupport ? true, libnl ? null , i3Support ? false, i3GapsSupport ? false, i3 ? null, i3-gaps ? null, jsoncpp ? null }: assert alsaSupport -> alsaLib != null; assert githubSupport -> curl != null; -assert iwSupport -> wirelesstools != null; assert mpdSupport -> mpd_clientlib != null; assert pulseSupport -> libpulseaudio != null; +assert iwSupport -> ! nlSupport && wirelesstools != null; +assert nlSupport -> ! iwSupport && libnl != null; + assert i3Support -> ! i3GapsSupport && jsoncpp != null && i3 != null; assert i3GapsSupport -> ! i3Support && jsoncpp != null && i3-gaps != null; stdenv.mkDerivation rec { name = "polybar-${version}"; - version = "3.2.0"; + version = "3.2.1"; src = fetchgit { url = "https://github.com/jaagr/polybar"; rev = version; - sha256 = "0p94brndysvmmbidhl4ds4w3qvddb752s4vryp0qckb0hz3knqk8"; + sha256 = "1z45swj2l0h8x8li7prl963cgl6zm3birsswpij8qwcmjaj5l8vz"; }; meta = with stdenv.lib; { @@ -44,14 +47,16 @@ stdenv.mkDerivation rec { buildInputs = [ cairo libXdmcp libpthreadstubs libxcb pcre python2 xcbproto xcbutil - xcbutilimage xcbutilrenderutil xcbutilwm xcbutilxrm + xcbutilcursor xcbutilimage xcbutilrenderutil xcbutilwm xcbutilxrm (if alsaSupport then alsaLib else null) (if githubSupport then curl else null) - (if iwSupport then wirelesstools else null) (if mpdSupport then mpd_clientlib else null) (if pulseSupport then libpulseaudio else null) + (if iwSupport then wirelesstools else null) + (if nlSupport then libnl else null) + (if i3Support || i3GapsSupport then jsoncpp else null) (if i3Support then i3 else null) (if i3GapsSupport then i3-gaps else null) diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix index 4ee9f461760ce..0e59ef5512d81 100644 --- a/pkgs/applications/misc/rxvt_unicode/default.nix +++ b/pkgs/applications/misc/rxvt_unicode/default.nix @@ -67,5 +67,6 @@ stdenv.mkDerivation (rec { downloadPage = "http://dist.schmorp.de/rxvt-unicode/Attic/"; maintainers = [ ]; platforms = platforms.unix; + license = licenses.gpl3; }; }) diff --git a/pkgs/applications/misc/tasknc/default.nix b/pkgs/applications/misc/tasknc/default.nix index e44690a5bd791..bf0e964d591f2 100644 --- a/pkgs/applications/misc/tasknc/default.nix +++ b/pkgs/applications/misc/tasknc/default.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation rec { description = "A ncurses wrapper around taskwarrior"; maintainers = with maintainers; [ infinisil ]; platforms = platforms.linux; # Cannot test others + license = licenses.mit; }; } diff --git a/pkgs/applications/misc/twmn/default.nix b/pkgs/applications/misc/twmn/default.nix index 020aa963541e9..0667ec49b3287 100644 --- a/pkgs/applications/misc/twmn/default.nix +++ b/pkgs/applications/misc/twmn/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/sboli/twmn; platforms = with stdenv.lib.platforms; linux; maintainers = [ stdenv.lib.maintainers.matejc ]; + license = stdenv.lib.licenses.lgpl3; }; } diff --git a/pkgs/applications/misc/urh/default.nix b/pkgs/applications/misc/urh/default.nix index 7bf9aca029b98..56da0cf22efea 100644 --- a/pkgs/applications/misc/urh/default.nix +++ b/pkgs/applications/misc/urh/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "urh-${version}"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "jopohl"; repo = "urh"; rev = "v${version}"; - sha256 = "0ncvfl5iyngw3lr2g7awpskrrld6y0x7w0xyp827lcr7x73fvqgp"; + sha256 = "1iq84590cjpf2rlxb60fy4hxi7vir27bbb10axbwrqwnp5cc4bql"; }; buildInputs = [ hackrf rtl-sdr ]; diff --git a/pkgs/applications/misc/xmove/default.nix b/pkgs/applications/misc/xmove/default.nix index 32729d57475fd..e461a2c8816a4 100644 --- a/pkgs/applications/misc/xmove/default.nix +++ b/pkgs/applications/misc/xmove/default.nix @@ -14,5 +14,6 @@ stdenv.mkDerivation { meta = { platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/applications/networking/browsers/dillo/default.nix b/pkgs/applications/networking/browsers/dillo/default.nix index ab1e0822bf1a9..671ab03a2e299 100644 --- a/pkgs/applications/networking/browsers/dillo/default.nix +++ b/pkgs/applications/networking/browsers/dillo/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { ''; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; + license = licenses.gpl3; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 2665a20d3add1..13808fca99fef 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,985 +1,985 @@ { - version = "61.0.1"; + version = "61.0.2"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ach/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ach/firefox-61.0.2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "e872332980e0af6f087aeecf87fbd824604e0f30f45f60d8ee6b325db0536cd2f79fb0550236baa7b6d2087fc85f3561ab793de273c66ddc44896eaf185104b5"; + sha512 = "572696944414358a50dcf8e647f22f4d3172bf5ac846cd29bcb4baeb0ac5a351f361632ee87dacc1214633848f9970f93cbb25a6e9cfbd9ee796e30e06f34715"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/af/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/af/firefox-61.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "882595f99b6481a42d9d2e6e11ff9e71b562442cb267d02b3f23797cd96dbd588610eeadddceaf378f22e84df01d63d3e3941d5630a9e1e117043ff2c4cc9919"; + sha512 = "dc4b22a8df99c3519f3a8001d0bdbcfdf4fc5d4dd13d18bd15892fb29e928126d46e2ccb9b512dca0c5395852a3c918a5aacd2b9a7b7f2cdb982052e915d5413"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/an/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/an/firefox-61.0.2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "ab697e5e4b1286b19fc8554c248d95afcb5c605d4e83f6d5d060280e3b0dda6b3214fee6b05aa50bc34713791fd4236f7c6e46b42de5131b6f4a66d306657eea"; + sha512 = "2d57784a18278bac69c08e81fafbdc3530d17a112d3f1e7d407e2590935c87058641498c74300950d3f151bf5fd67065133d91c83e1e500c72b60ebc91a4572d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ar/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ar/firefox-61.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "2b149c4a4fb2f9cc40bbae2827f17497510f9eb979db3ccf55b84f9563dfe0c08fcbcd36e74b4e685f940f4309827091270750f66d1f96e9b6d01ce591c400f4"; + sha512 = "e397f8d276c115105afcbab6fb71afd7bcc93778e79ec86a4274e10a6a039ad3107cbaabc9dd4bd197ce6be7add3cc0af954f029c179a6972ad2ba15ff2e3eb9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/as/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/as/firefox-61.0.2.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "d40d924dce02fa4f269088163901c643b902bf13d45f15a902da0c97b734ec2924b0346161ce86cf7336018c46b775c7202dc516b4796a3661be56f5bfe66b60"; + sha512 = "9869e76e004c1e77d976f01f9a4cafe29c253ad3c85b1119d67a65c784b5f65dd7a4927ccd535ee80fd63a6a47127e614478effbd0455a227e200ca31c846acb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ast/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ast/firefox-61.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "a705578265e08e3ae8595074943378ae7ec76d614bfa2b0d3affede6842172b605f96db4aaa28165d45ac9bbaeb3ca4d3681cac698a4a77b14e723ff2368575c"; + sha512 = "5b298cce253df9c8a072fdc93df894fdb4218c720ded3260f282c711270086104eca08e2d5afe1be4960beb274017eb4e0ae7313ceb5d6e596d0591f026f78fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/az/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/az/firefox-61.0.2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "4189f7d1ecd2738876a72e65641484320ff0c4e50faf94d782b0ed3b3b0d1877a4767b45034ff8296fb54faf7f3d6a388579cad5eb9f35a60def134a5f02392e"; + sha512 = "cd8df2a19e10d5445ac0970814ad245e25f6ea695ec9590344c1a4e261b6fd7d15534028f6a8abf1943fb97f0e127ed55774e2cc2bf7cf85be525503bbb69f1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/be/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/be/firefox-61.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "103d650c8e4c81339399a1afd8cd92a2df39cd4474280307f4902e5510b679b3985a1291310033db28995f483121ab55ad0c890b88b71502769da84e4dfe9558"; + sha512 = "94947ee7b7477b467016cd21daa8134bf28ab289ea29c0905e04291b7560da895124be2ab7403d2b9874291b7e33f5a92d36f9c0ed9d58ccc3306ecd7723305c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/bg/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/bg/firefox-61.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "187ec7aabb8931f5b99a7ba400947370df299a001c06d923b7d95c4de5d2f044f92cdb13400ae751175d9d50ede3be7b7cb2a22d67d07480bc6d30cb0cdc8e2e"; + sha512 = "9b0bce62c85282c79708245fa792207dccd7bf939ebc23ddb2e6bb7bc3f6fdbfdeecf69d1ba599b2ec8d10fe2d79bab5dd229cf9fa7b79e076797267df39c54b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/bn-BD/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/bn-BD/firefox-61.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "12db6da4e99ee661595773c813bda46ac3418a7d6c79b2532d6c26bc726dead4d9e3f4c913218f858e0e5709da6384befbe976b6958601ba1453ae93b7595b17"; + sha512 = "4de95899462eafed03464fd054b7ee12cf53d004fbcb58ad18bd462e57f5c50c31d3b50f689a7d54f973228a2877e6c77c47740280daf7d6db4f7ba5988b9484"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/bn-IN/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/bn-IN/firefox-61.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "678587691077d68613a4d3adce48c8b73660001c7359240b60325e315f792c1febd01a05492d494df13b19e6d8ed6b3f3d00202acd4ec9468bf744fe627ce08c"; + sha512 = "2ecbf2ae7d1296dcfd6e2268dbc27060ce07bb4b3d9d62f6bf27fc8874f114dfcca73672adb4d411d2c1eca7ffac22f7832bc5cdad12a492c3bc4406e3a6746a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/br/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/br/firefox-61.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "1936b78bba3d802b6a4ca598cbbabf840f8febc19b27e4bc8994158874de076d68b44972e1f1ffd5f1c5ef29f6d08605b1a6c087c69a4bcb4ea0363569d79221"; + sha512 = "a92abcb1aaec11ae3b0eee75b5b5610157f8ca64627a20018925431ac09cc4295d14357e63ea0fa2b66bb415039c659f53292b8133558d591a16cbb5772f875f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/bs/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/bs/firefox-61.0.2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "03ff822e4f6dec24385491d711d9b4115bcc2452d79ea46542e303ec17da8e5034206f4117d9d5218257dbf33928230a17e51b73e4aa71760167b11ef36fd92c"; + sha512 = "15dda8914e02198a9b6efdf0ba9dd4f37e41ec7c6674b8b32189ccc368ab6ee671e401cd668c5ed57157634220c176be543c277342e708baf7b0110cbbb4fe64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ca/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ca/firefox-61.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "91edb8c454d77b829a4b639f3eb820c4f8cc62e83ed759e817ee433eb5063d0565b2f959be21a090ea9a9b2d36c2345e1b8024c46fdf60679eec91f6a2aaec31"; + sha512 = "230591cd45dd9d3644313b96ea304d33e9c87d6968c37b73ac3c701132bf13a3869672317b135f31d8082f39298c978c07d614f5055555ba9079afc6e17a489e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/cak/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/cak/firefox-61.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "654cf46693e478a242f900569e64d18c0f61e2d6d45e8b5af0e46577118083c0fcb1a11f127453d70c028bbb1011477f9420b3a2456afbf5f328803552879e72"; + sha512 = "c622e622cc199b8a9946276afdf03f006403bd302d2c62a5076403e6764dfdcd121c1e15fc56d45bdb1751131326babdc9be96e6425fcab9e55d6c689e5959ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/cs/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/cs/firefox-61.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "81b762008dfcaaa2b7d2921d84267f6a494e3cebe7e899cd6d0c70777c28d17a97647eceace8dd26e3dbc03c86d21c3471aa4f5cb2a95548b790a3805dc4f535"; + sha512 = "8e4d452a75befcb6c2a6e7ed0b4b1aaa8f18d4d61302ddf6b8143e024352a060621c375742748db5981efecb8075268f56811702586189a116698a669408dee2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/cy/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/cy/firefox-61.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "398718832a292c556f1fd0aa735db9a90776d1fcc88955d2acc2f712e24106ce89d532456f9922d3a3a96136b508a236bb2bf0edef8f2f6a1670d02f12102200"; + sha512 = "349f73f43be8dad527549ff158b267c62be7c0d828c2adcfc635e419ac9840076549a7a51396b306bc042d1d7697c8d6caea3bf0b4e3f42e7c0efbd5b8d92e1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/da/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/da/firefox-61.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "b77a4e71d3a48e7d2de30f7f45274afc6e81f3f12fa6391b62973489153709a4f4d13d8d880ee5546254ca2c0e48e8fa24e5b2f70364313f6fcdda29c627f26e"; + sha512 = "187bec61e1218fa6c2fe79b3e80066a617ee3c26f83aa16b61a21e3fc76a64c2c821120f9206240642dd10175b6976c352b13a5b2e5514126a3840524fdd1de6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/de/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/de/firefox-61.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "ce223acc8cfa532933fb29896e5169ce3a4c9b187ec5424022e24d77ea5f8c47bca8b389258f13a2280d32aa0ef1490e71e95c6324e8815e91f0503d66ff7345"; + sha512 = "8aaa8aeecf1a2dff922b785ed3a4cbf248454cf010ea9c188a4ac70f0550813944a8e9265c2edb13bdbdfbe20ec5a0dda3168d2dcd529d082bafcfaef6271913"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/dsb/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/dsb/firefox-61.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "e79b5ad7f5aa1e8f27ae3ae7bca8a0ac24eb73a1a9feb6fde51584b46cebfea2dcf3cad67a61b0e612e6dea900f866ac8fcaf8bda69a11d545cf883c6fd4b7db"; + sha512 = "c821eae950e48de43580c9dd4af7fc609927e3fd27ea876fca909bb3319574663120688e442ba83acf1d273e1fd22a87d0cd934e68151edd9a8561015e58a47c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/el/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/el/firefox-61.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "4bf55b08dafe5e9700a56b11fbcb4945914e7805279f40f805815bfe57bb6520667807b6b6ed3fc9843d3cdd1019faeb17428eb5c0fae8b3152b5d7b2528e5a4"; + sha512 = "afa286bd1ac48a6007b6e5072bce0a26482a0eefdb00aee824de8c4dd06688d16731252933cb71b9f3bf6d30f951c6df68c2ede85733edc81facbb628118c72c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/en-GB/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/en-GB/firefox-61.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "c7cc66b75a630fda0f6e10cd9496975fb63dbcefaf1f6988f66f1f5e86925d569ba770df6de86dc3b479f43ade9e43d515777475dc34ba8ca9d1f2f86623a1a9"; + sha512 = "c2ca0c9a72503ac5817ed9ff3736b812005037c51534ef9a159b7914b974a356f3f1bc89d0669d05bde8dde124f2fcc3ff3a91cb412ec0329c2e6def875219fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/en-US/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/en-US/firefox-61.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "9eab9c7b56ae920337b21953516271fd9ae1b3f3ebbd549e3e1145f96e0adb98dea082167923badf97a109a168496290c2be49965f3034667de49c1d76a48a14"; + sha512 = "9f32b33727e5877bfdeb186420a02f185896a2a5803565a811203d86e84d51ede06f27d63a88a482028c36b65ed92ac4c17196aa2069370d6cae09b74bf482a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/en-ZA/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/en-ZA/firefox-61.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "003a2a93ee8138fc1c696e3aca12c10eae3e4a94a854305d96f25d3b0340068414e87cafa196a471a7bac06eef148dce8eee22d74a8a18ce3eae22b8c6b8237c"; + sha512 = "e41b7ea34f193bbcd892030b5feb2f117bb5f3f9dfbe69560ea64b7936bcdc47a55e878c645786999a2e52c4333c033320eb1ed9aace3481a9f37d87c9ae9ccb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/eo/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/eo/firefox-61.0.2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "a2c71fa1e6ed3b38d65fe1f9f81e34f53dac6dd0d1411d8b4eb08beba1882e2fd3dd286d7c827ec8731aeba10243fac15feb5d42ceaee45231e875bc69734d4a"; + sha512 = "e0850feb028cf0644340d2842b054e49608cdc1afbb9487ee744f6fe1ce0662874f0f96de2da52de2e0abbe39d7ea430efc70392d555e7cbff7a46f9029ba9fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/es-AR/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/es-AR/firefox-61.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "b6c4bc1568a760ce22613153c289d8eaa3ddabedc181ab891957e86b2aad8ef4022d6b4622a2ed897fba5b1ccd7732fa5c74480c7414d18c2777593b17931bd2"; + sha512 = "72bde05493e4c140f6022e24cccf0ca580ed3c423840d2631cb28ce8a20be92837f78cfaa3b09a324bbc0fcb064ced351fc66a0edf2c56d972f629aed6662dcb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/es-CL/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/es-CL/firefox-61.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "27216ca2542f8bbd821f94525837e1b21fd46bd5d79c06476ad3b1e443429678d625ae4e23f220dd383e3b32b3f5e208bbb1f95bfae4afd7f2bfe830ff007109"; + sha512 = "4bb298e184263edff9100e1e7f58cbbd405dbc73a265a5dc1d78e8cd25e538d34ef0994b6b5e79082fc12f1c0b2035c944e17eccaa7e1bd92eee8d27d8f50400"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/es-ES/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/es-ES/firefox-61.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "77698e03f595a02535f058c7649b2fe7515073b64baec470b21f2baad5629873d74ab62bb8db7b695863c8ca1c0d5e54a164439c3491576e40aac885cc9eaa6b"; + sha512 = "13d7f54f7899eda53add9dc4a1bc27fd30e0caaa9c5a95d716c1ef8382c2317733cc7a71aba9aa4f2a024717eeb09be7fdd55dbf6183d1679e61e3b57964e61e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/es-MX/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/es-MX/firefox-61.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "837cc72cf2bdf5524f5912da8c72b17882d43c089b63958ebf45184bc375eb77294a7196c7007fb4016afe83be5ef46492beef07a0965cd09493cfe1e79a7039"; + sha512 = "66c24cd9a80da6137a94bf9cf2bad4ad3ef0141bc10c8d92435f9d89e11712afc08018d7e1b4f17fe03e4ac62b2f6ed1cec638dc7d0726bf27453e1741a1ba06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/et/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/et/firefox-61.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "446c4ee9b2b78966181bdb4a9bf7ac84cb350bd8ef0ed609479c54f314ba2e17ba1b23da244fd1cc58b1ea388cddb3897b48b754afd36ab7c1f5fb42d8e51b10"; + sha512 = "a7a686b1e16b616a3aff8901148a2818cbbe2459851660a23610ddfb4b8109aac159fe80986744bdc4124a10ab160d2703b2e8f65def0c86977bfa3fcb3ab020"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/eu/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/eu/firefox-61.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "f1fc634a87af4d75c0bc71af2a657dc26fbf31b8fdfe78c292f97a3595684252a3dc40e55d1632f387164907dff57625af5b8ea81d75fd1930f5adc744e6298a"; + sha512 = "0760621f5d053fb802a46151f6283fb7a0b7de5c22ba0a55ae0f3056b0d43cf16c6da79af8a2217a665825a840b9c83134128f455dfe6e83f473290e425ad396"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/fa/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/fa/firefox-61.0.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "0867ec71cbfe6e56d244acf9ff28408a2ea3d55634c6ebf68fc68b89e5f6fb95cbf45efcf9f76c4106ac44d333c191293b93d82b0414d2a882186a5d5475436f"; + sha512 = "29e8466e754900b63704206b5b650ea60aea841aebfa58187013a495a95dd32d939308253b0f856ef5e04d3ddf320c289e74cb03830a16374e9fe2c03214a1b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ff/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ff/firefox-61.0.2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "5d31ad4bd4260634917fe9f131294e612f211164551fd232a86ba5a408c52056f20f82d5a6c8cd62182533bb4a09d29766a908dbbc604abd5804ee53ffac040e"; + sha512 = "240232a8dd4556c5c4df872b60b3352176490b7afd4388c26322008c7dca489f48f679c21d148016965ea81d850eaffe9fb7887b97cbbbac955f9cc29f28b4f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/fi/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/fi/firefox-61.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "fb7f452ffed85ca74c2d214654decb4f61ecd397b923428b9c3214b88890c322f4cfccb3479965b201a619c535d6bcaf0d6dee0fa631c1b858dc7ecb902e6040"; + sha512 = "63c7d4ede5e02c9d4b2e59234b57d4f539c0cd3666a053b127cc18d080900bcf488f8d3d7f2dfb98399a1cec5ec6780d86d93ad9dd2ce7612e84604481562a64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/fr/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/fr/firefox-61.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "efb1a2ce95d407cfe519d6bf1677918c3edcb837fef9506c45084ba873669be0de976c9b5253acd0af0cec2a4007a61f3c810cc243661251f7aa8821e2dc9e41"; + sha512 = "3a4263e78c62faaab850c743660e633269dd9e625f03f94459b34ede41989cbaf498755fb8c2f507e4f4b88b633c29a3eae837ffce0572ee03afdf67c53d4ed1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/fy-NL/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/fy-NL/firefox-61.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "82445a34694cdd79a2f9619c9269615d70e2c8806fcd7be9d201b42e0e462a56372a55d2138c7ee795d5df36da9da224668db33fb0414600aba9f517f569e558"; + sha512 = "e8c7760f3f64b4c525bd0521cb66ed11bdd9142deee986fd6a5f6a322685633aa3539f819e3ec886884906998d37dd6401b77e4790a246cd098c47cd49f929d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ga-IE/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ga-IE/firefox-61.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "4fe90d326992d7289e9a8650f27abdba2a71e7a4fea86f5a0c1a66217172deb2649fc69e8d43f7b650f16a465ab113f079267097e64a50c2de9218970e43bf32"; + sha512 = "8f59620f30767cd58babc163b803b2c8b174562e5a6a686c5a586d24db0da4c4ecf180c13673a6a434faee02c2b7ef746c1f10e45055d42327044a945925e514"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/gd/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/gd/firefox-61.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "80a193ffd23e52d0d31428849d7bfcad1d92987edc4e6d6de48aa8f8d573451578ed99a6faadff24872d1e77633531fcf96ff08742ebfb311b010b8ea91b5ee7"; + sha512 = "ba496ad0daec76e2c6e4f3c2dbb8219d1f3234893acb09602e51b7bfab4ef84d9f49104a021b206ff528bb323e2255c97e92a6949b3949098e5863f48e9fefa7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/gl/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/gl/firefox-61.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "8edd57a08730b18e343d7d550e888341ec17cf703d3f5a63a52ffdef89c6cb2aa403486a5b417f8798137db69d3ccabb874caed0ee412f17515a2587a0f446c4"; + sha512 = "3ef33eda5d7a88fb6f67f91983ab2db11404f58686ecbe30dcbc27dd1358660b4c88ab8e678184cdd3fd4102f93120e0d0a4d75435812b047ec2bcb74cb52a83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/gn/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/gn/firefox-61.0.2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "b7cf94842186bc094a82a27a1e5cc53746158bfcc4c74f66760318b59ef2c573421b08b56331afbb00979be38d682700dcd2020e0c315b25c8f98651e337cb1d"; + sha512 = "5e86c34b627b66872a7f07e30ee6285e61d041e69b0e2355eec142b23ceac8ea5ef7e257adfd1ae877b442f7171381cb013fddd7593d1b6e42f3a22e2267a5df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/gu-IN/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/gu-IN/firefox-61.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "ffbe4bbdf378799f5026affe421244cbab92c3c9c9697b56d28928a959c6916ae8807e190e659cfc0ec119eb6d98701bba8bc67d6eb62d6d9a0e530159c8ffaf"; + sha512 = "72e43c4dbc3db08473d96d0686fa2df56f82ebdbee064a152ebb2a49cb4fa7a9a80135fa9b7106ffdb64d3342b38400de5351a3b225360d5a730f0f4991418f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/he/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/he/firefox-61.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "26428931a19d881ef5d4c9fce86327a9575899160a376ea5e486d3f0e413a25f44f28dd13f44fe7499bf72e198ae80c0271674e0882847fe487ea65b7e2530c0"; + sha512 = "d3b5a43aff6e76264eec6d211a5a9dd0b7fb89e41bbb265f31091ce3261f4a160e1ddaf59432bc3771bc5afacf1a3e12e42e0d08107727b0e8b5941ff29174c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/hi-IN/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/hi-IN/firefox-61.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "9eebf3a40c32f8ee17c14233e80c694922429dcf783fde48281e8ea79bf046f2daa2f244392db8c9d33beb6cc95d55700489dec1f95e5709f120e540dae3e7bc"; + sha512 = "7b568bad470b3fa069b44bc0d69fbae51408ab44751a99fc36a7c220548d0200ec57d8362dbe1dca7370e587d5aadb45b5c9dc91e6d267f2421fe5a2260d29fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/hr/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/hr/firefox-61.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "f51f38c60d4fffd70b9be574643147a1c12fe70f0a617e996fccdb408aa40665fa3a30cfaa5f843d98ba1a91b17df71aea211677068057d8c2358b5853a8139d"; + sha512 = "c69df1a2226a967dbc0cbd3813ced6ae36b696389187489ec62b78b3180800175d3c33b07bc84c45112947348e160cbcd6db2e68d5e4b6f07e0a2f6adfc8fd2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/hsb/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/hsb/firefox-61.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "abd9500491a639a27f1edf9c8d9f32b5d3097f673fc724fb9f4eb5b89ea848c5ddac54be5927fd581254e0c343595ea131f58a6a2e68e03e3176c896450c5740"; + sha512 = "080ad8f1bf263f96294e3e6178dd64d30a7fda50d229081b14e54bfaa183c6efeb0ba3aa66cd23c8541a622382e415a12e3e063cb3aace5619d3c8c212ea3078"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/hu/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/hu/firefox-61.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "11bdc7443008f76e6adc2eb54bd5875df846f6dc050fff6f9dace91e981d210867a248bd3fb98c20bc2bb4012374d383c1cbda58ee21d0fa57ab7545f25efb8d"; + sha512 = "44f07968bb89c3c0e2d365f9cfd45d89b138a269cdff48542124a34f9d9ba9df5103e4613934c504f90b494fe20bbc6f71a12c210799e689e8f69405ea22e4a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/hy-AM/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/hy-AM/firefox-61.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "5fa03106c35a4781f27d27a9f6e4466bf93e56b7d094b851cb057833a6cb2376a231066bb04fd05e0ae0f32b42ab7a859447f8401bf0e3abd44fb9bfb9ec4e17"; + sha512 = "8d3ee8a030ad60ae2de062b21437e8d512ff3feaf614b91da71ff6af9d3994be79aab1753e3d46a94237d7e0a49eb670781c2567f96662b6057ee7172a0363c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ia/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ia/firefox-61.0.2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "e0d442b1cb6c770ce00b1a87669e61d6e60d6803a4623cd67025bbbae1345839329f6d924960c355c788dbf4ce4caa1f1b946d72ae7df824105cb1be547bade5"; + sha512 = "448e543b5f7075e2e1b984c808dded1ee67dcefb600058635c87d0c226eb02aa8dd7f59c624ebec60c9c0b334f98607eba88e111f2b03a1aa579b74b1398511e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/id/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/id/firefox-61.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "18c827e2f584e649a4a4a8653dfa5a3524ce5dffd7bda78bae3e1e6cd183e7f68605abf0f108552aecf20ad75e5837800f6cc98c8eb6efe479e143e03a629b6d"; + sha512 = "a1f8eceb53485ac41a685f98b1e9dcf57ac094c0911ed8f9a862d4b3a5fa8072c16fa6a4cef3e06d15b07b3866397fcf9ead7b4b43143e0f5dccf93acb2f7676"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/is/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/is/firefox-61.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "d2230cd1cd82ab815d66c673a5add1cbbaaa82a239f6d8ab19b09a4307e3eb4cfa1355fd599e60adfeb12735a846a71917ae25f4896608fef4ed42438743c1b3"; + sha512 = "43d6ff785394bdfb6c376588531a9fe043b18fe44ae83f481b11d71a2422b5d5022356cf960d92f55fb3d0ee103e6534bc0299a3d84e9ca7e6b3a5544e11ad45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/it/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/it/firefox-61.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "44c6d3d5ddccc04f6a7ed73346051fcaa6131edb716466956d063d432f22c8a2baa70d5bc6dc02fe7f5046a12e166ced2a5e203bc71da140b68e7a1ac55f5612"; + sha512 = "460385b5854565f4ca33431c573ac355baddd7a35a2fbf631b3748b02102a749e56fb1128ec3e9f6b721b1123578060641bc3b783ece271a1708656626b10a13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ja/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ja/firefox-61.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "d8374b8f783e7c24943cde05949939260934b0d006a5379fa7de9b0814668dcea935bad2d69036fe03e0253c99f792c690966ed8ba3db94bebb9f58d5cd628f3"; + sha512 = "682430030d87391692170bc81d759d806f4667b66b4e3df84e836e65678f274720038d0556f5338d8eb18e281b64249e758b5265b3ce30e6f272ca9d84ac1496"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ka/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ka/firefox-61.0.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "a73aa4e06b9a198c931119f16e8e8e1bb244c231aa080f499c442a5b2fe3095640584ba5637665492aba8ca04ddb2cdc45648e1fcdce8d74c28d71af46f008e3"; + sha512 = "e8c9e6a61867efdb9d021aaa8f059e3ac9896444448b08b7d90f70fb2847d46d1950a24e6fa2db0b947cf3ec628bba1c230ee7d8d53a959928122018a9e5c7da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/kab/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/kab/firefox-61.0.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "207a97bf5d9fc1a4d624657bc68067bee325fa5b05ba34347cf6a6998168792974bb486245fa716a013e96112f9899998b7d2518da55fcbc551bf0634ce50902"; + sha512 = "17636e7157d6cf3ab73b7e36eeb7ad5bcc35e756fe6d369b98305c58b88208b5b11f673f52425363425d18c2a7fe79274a6e5babeb926adc9cea22afe3e55e5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/kk/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/kk/firefox-61.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "c81fd754bf280972ae7c6f59c3892dd7ace4a399a2dceaa5163fd078ab3379904f7a8e4f831373f871f0031f8557e098646ca04ed7085e8a9d40914d407b8c02"; + sha512 = "4eeb48f250c617ea8eefd99fb44159170311becc229f77ca014e801594260ea23ce46ae11e0526ad620dd830b857b73de8a3a90c18764ab2a8f71cebfecfa143"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/km/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/km/firefox-61.0.2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "eda95e84eb9e2d3e073668bef38e68473b0e628f8ecc5a2e84d124f7ca3d060949ff1e0909c08002ff51707b66d08a3ee955417146a8e6a6ec03bbfb5ad39290"; + sha512 = "57a0bb58ced30d8743c30d288250328568758674e55127d51e99485f5c85e8b0b300aeeec4d34526f53d1d538189b75925eb907e3b5fb2d455e0546e179dfe04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/kn/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/kn/firefox-61.0.2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "8254394f428957da380a576af4ceb49e6a2a0a82c35d7b0aa2eae5993c12118114fc77875f7ee1a80085497bda1182ec7ebefa42d66a268640c87564e6e2c7f0"; + sha512 = "c40e9f5906cf3968bc92932f45d4d0b712322e6efd9a5d1f3b48a7b94a162c6390142081a8a4fd2f0fb8737869723432eeb5a4b44c3161aa38a4d506bff8a3d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ko/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ko/firefox-61.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "d59939490741318d2fe11900df7dde9adee99d8dbd04a365b4a13e0426898109bef586bb097884ae280a8261aaa21d38673c352bea06b035731b72510d4ce35f"; + sha512 = "3f6104ed9b2fb9f1b0e3f49b06aaaf513ecf7e31b417af90c11403bca7a3ad51a87b448fa0a2ae6a01462b57dfd21f90376421ca8cd9ea62b0e3a1c7462aa9db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/lij/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/lij/firefox-61.0.2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "cc95e24bf4edeefc3cdd8e4d7be72b88f51efff45a61beb35d4d4f0e42727fd97e762bf2f04d9e96b2fb4052c8e34796723f49b2b80117819ecd0594e8d6d901"; + sha512 = "46c8eb64b30455ed97618d67215510b22acb6cf5946ba492c5938d879e656d983accfcd7ff2e93cebe7ea5a52e9fca348ebb9ba02e70ffb4196a9d9edf5abc51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/lt/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/lt/firefox-61.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "4d6b6dba9d9f75a315549969a68d73639ae61a79025e9dbffe0fb171360c8b0e04c3cb13653e4f294375f248a7f2126394b67e7c21d20170dfb5ffcdab5c9df1"; + sha512 = "54470adc31bdab9745f72598d402fc961d6b407b6f8fabc8e0c6b785a5a5f3e9922e06a922688c6bd1ba43be81ed37bbab216fe2182bdd0b32befabc55fa1a48"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/lv/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/lv/firefox-61.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "f47220148f2190b71f89708348a57d830d74168240e4badc3018f2ae1c477ac0ed0f4273ede81fd50773c947f478cb812da98b2510063b74f15a6d6b01f83923"; + sha512 = "376ded474c9c8a898bab54b66a4a9e9cb598dee114d9a156b9e7fb925250511e610d2e17a5decf4c2db44f227065cb2840265d6955364a1405060ff022b04d07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/mai/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/mai/firefox-61.0.2.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "b77dc269a68f39e36becc013128895267fe176cb6f97e5a2ab07e4191869647208068bcf3579d01085edf7490d061851f5392f984be2687b5f067cde98bf3d47"; + sha512 = "21643b1b723a42d81bb4476b16282d2550100278a221b5538d5666c8fd7f3e96f242393c4b175cf6431e82458e199fa80a51ef0f5bd6a9b691d0150bf1d4c8c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/mk/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/mk/firefox-61.0.2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "444d572534c326688f267d624f1ee661f2a1b236ee7b4f62009d6a6685636b07dd63faf2066a12f9dcc9434fbb1ea9be663456e06ce9afa66516ae3911b4fb60"; + sha512 = "452571329b805586a1218dd5fcd5b48f7f20fc914ba006441ec3642ef8653537b764a98b7916c0e440888d60d41b290826114c3a37083ec098fcd6c86a6adc15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ml/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ml/firefox-61.0.2.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "74d42e5341168db08fb4c012e88f53b9388f67efa9a0d5907817b3bc04540c721c533e077d1c05ac1b067a2dbcfb643ddfa08966cbd56ab0e0f46f2c822504eb"; + sha512 = "8d2c850525f9ffab96c4d02908440a9a5f4b6fffc49e5505d5eb33d35d3690fd7a81ef73aac810d0c52e0deca5b69dff9eb3f0eaf508b7c866442943f7cf9547"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/mr/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/mr/firefox-61.0.2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "3796574509f0ea2971f02356a5bad744a6b0621054b55e391e22cca934b74cc7e3370e550a3f933db7e92cf9e070cdf6d3a576036a72c2ae228165e2a06ca6d0"; + sha512 = "1eedeaa3a2b6362c460e468b28bf7efc9bb5c960c766ec9f0e423834aaa67248c5bea0fe9b4fc0a8e62b0a40d8dfd1e7ff31adfebf6d1d6405daa02879977015"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ms/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ms/firefox-61.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "920c6f3071d24379a9460f74d8335b35d0114da5eab39efd2979f150ad9795e8ddc16044173ff69190a024f824502b96e047bd79fb1ecba554f0a6b8da0c311d"; + sha512 = "fe2d5ae09b8921d366616eaee49c240ff529050e1b3f97c915d91c23dd67b22d78a75e14e2f192963f0fcb05eb812da2c5f68313599111d85c1abc0ac9dbb676"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/my/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/my/firefox-61.0.2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "bfd10c2dc7377a2a55c437520f21401d750831d088995d98bf4e1eb2524f1d69b49d3ca64ec76e8c875757075a270f1714a8ab739a5881b8897b8c9320d09281"; + sha512 = "631a6059d38a64c24e1f7d2b9a27aa2e405fe413471ac1e1d7ab337f614df9a1470a091de35904c39664d679c06eaddcd239c4a392c1e2ee548ce0be7fd5e416"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/nb-NO/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/nb-NO/firefox-61.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "1955303700b9f3b7ceae901076e51400c977b35864ab96d71f1d3d246bc4348464e7cfa2e9a1840b6b06f3c419028a0226955eb8b5e72667f4b433d20570da26"; + sha512 = "90d0c3c696ada86b47e9a6ce8aa9a8d0939eedf5746ccef79ae170a935e6b97906b187d7839af158a6008a9022cc50467febaf0617f3a3b1e8e21fd648805d13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ne-NP/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ne-NP/firefox-61.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "4398dcf4bc81d8ebdb72e0b6ea488ae707c04d175c8c18248fcc69899929e2d5615eaadc04804d602dce0aaf97ad19358b178a43604434d774fbf82dccc7546a"; + sha512 = "b5e13e214cbea0d541aa8c29d53afa4ae952970a64bb5695be62ce19c829df901dba4c66cfd03d5d3a31f69041c9c700553b2689dcc4ac4ef254d155700bf5fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/nl/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/nl/firefox-61.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "c8a8e55cdcb4eb6b2b19d600c5cafabd8f8dcab146a4c78e0d4bf66daac8798b63e2b30f5591f58c50117632d9b736351c2860ef28267e2a5f6bc3375cf3ae03"; + sha512 = "44470b1cc4e95a05b4198ac3458125651de9bf9548dcfbcab5850c519fea01a3e8c6161e4a66271af68d7f1a1b37456d2ae1e51ca890307e6185a531c8cbfe74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/nn-NO/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/nn-NO/firefox-61.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "6e0c8d61c4b6a93ec3d8935cf92254957a66305ef743007946b959ba1a6584c9e585e6f4e971f16f826d8f1e09f3aca50a68aee3de1a92c3afe4a3b5fe712c30"; + sha512 = "5e49d30ed8fb64e367ea3f5b472baf0caff6c4b880d811cba5db969d21f8e5dd0d8ae4c01a151fd495eab1eef817b35b6a6e14441a860059b8f20453dbe86116"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/oc/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/oc/firefox-61.0.2.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "dc8cf40472f9503949a776c9ca9a5e29d72a7d218d1ec10ea7abeb960d0abf5d879b6952bd3af4864abe4f1f065b37317d1276358c3ae4c1e062dd4943dd38e7"; + sha512 = "bd75cdbb1bcbe24347f35b748ec5d62da6bb20fb0f58f17a348f8bbe19e92ec3d08da3148d41f56e0b42a8e49e1c1b70b40770c737e626239b5b538bac6d42e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/or/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/or/firefox-61.0.2.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "bbae097901a488360c98bee5bd19c43eb36318f0fa04b3bdd37c24fd69468d7d2a0d48ee20472f6811052410368e8b80bc49d00c16112e00608a11729b27ad93"; + sha512 = "e88f706c60e93b205484411bde177fd9b1ea921372669b5665ecebd795d7abcef5d2caee16a8605bf7f3f23e8d0ebf8036c156097318e7f8d3a22517e1fdf017"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/pa-IN/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/pa-IN/firefox-61.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "1e78585fa23960ab22aee044231de1d7bb99087f27ab717dc3d3d783593bef23f5af3a47dd06647344eaa1e896a72df217a90fe96afebe32bd5158e45d03f0dc"; + sha512 = "81af24b8ab70e373339ed4fd7116e1c4f2bc7a2ee14b46e2af29860add01ab492ec692ee2653de81856d04a465860e4cfda0af4928a237bc0c8469c4899136d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/pl/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/pl/firefox-61.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "e60a0662710985a7879f004e2ecf0d3a776ca346685cb314f964563917ab3ec081f73e411014163b4fececc5eb97a45a4496574c01bcc964b718306cf382b189"; + sha512 = "f7b6b21ab27b58ab1bdaaac012dc035e7cb1226f46da43fa3de37c7e4fac73f5303dac02332510eae7a8bcec0172769b620acfbaab8b383a64404bb294d6df66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/pt-BR/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/pt-BR/firefox-61.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "83de7c2b7f3d6939bf888fe9c5a19a08af78427f3b466a910e385ab0f8d1a1282dcd21d8c7160c1c45ed1a4aadc44934e3fd8708d8ac09da9bbe5f7bd5ea18eb"; + sha512 = "c17c0e7990b4192f10f7269a5c5c6c74cd6e6353b8649a0417c537197c5f853085948e9d0c50f08afbb16e242f3d8e9eaa1e9657bfb6c40075e5f4e640771d2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/pt-PT/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/pt-PT/firefox-61.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "700379d0a99abacb29ffebf57a9b50ca0a8bf1facb868cf6f3cc2ab41575fcc9c0e4d1b6e580a535e1c06754a4fd05ce5e7263791edde822e3e8d5eb9b5f87ae"; + sha512 = "2a5db6053556c75d399bbad5ffbfe51505f6b25bcd73008d85f7dba66d89fdf56ee0ba2cfce6e2617b463cb8db087a1700507051322fdd2ea8f732be5bfadb9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/rm/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/rm/firefox-61.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "6595217951fd22ec31abbdb90364e4ffe6bd9656f9d34e10ff6bc1182cd8872409467dac1e0f86c7f7eda8ebee1cb4af5ed0971fdc0c55387831ff12e012311a"; + sha512 = "94e95e037ea9f924363aa5b80298f67ecc678bb2e22d552c2207af1cdfdcd9ef5b85fa4a6b42ed08167a4b482859658ef6a946adb7462c2e2519c4685428bb90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ro/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ro/firefox-61.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "05e68cd9143f9cd0504ca906843d1d6e08a5e9152e11c237b461a1b63f00efb82ab7fd329a42aed7fff255d7b3bd2a6b5287ce0b2d3ace12c30710cb309e95dd"; + sha512 = "dc901a8b6ea913f976c915807bc4ab5fd4a756c98a78498ef52fa8577cb9e3a047e2a38240bf675d72644d975ac70d720f693db056e764218151431de572a37b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ru/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ru/firefox-61.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "5bf13f5994d8672cde5b7daf942abc2157c9c988fea459c5fd4bd006f68b013b3056440f73794a06bdd0947a4d2a5a7764d497dadde3b602d4d945ca49b6e855"; + sha512 = "dcaddf1072b19f714e9f50eb1d5e8e15bce98bf96bbbc13e7a4a82581e76339818766e389279fb33d212afa6cea947185de130a3eb72c0f6079e159ff2f18e9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/si/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/si/firefox-61.0.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "43b0859b38ea7ca87304f0f0d7b95bf161eb1ca1fa4f28c99267b8c746dd690ada601a2becabd70a3fb09294d29c82e69fba8bbbed8ba27938f43921569e6a3d"; + sha512 = "5544833432d6b41efdff96fcc8d2d322f5c158764320ae6345e9183b2d48817afd796685bb87998e5e6fd227b1753f503bedda5f6fdfa9dcad2083cc9b7df9fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/sk/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/sk/firefox-61.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "6507d61d87d4723fbe97a4f51c088dc2d3717925a5aef47e1cc21d75f191e64726b86a48f4c1bfa0cd3f5e59b4282626a711b335bca44c27fe06388f73eb4108"; + sha512 = "d4702ea94482a276ecafaeb7e991ab850a432158009c95489b2b87a82402c92a84c33ce43b27ebf58367e20d63bc444e656f32cb957ad0ad03b1d9f793157052"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/sl/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/sl/firefox-61.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "752a398b84af789bcc5a0138ec5774ad49fd0e116338a8da0d07133952379af429efa89721a72ffc092230545f870afd02668a5b9b76660c43d29ddacde92902"; + sha512 = "6103a4d340e45af988d17b93c4e8951a656ace095c9e13f5b0d6bcfd55d51e27f9f26614223d40dc19733aee34606a80a221838be86a1f91417a1c6f00a7771f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/son/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/son/firefox-61.0.2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "1cf5e57b99b57e243d7edfac411bfa8c894b439c0a88f169ae2566c986969af7fa13209fd3693243839ce59fb386456872420e57d06ae156923018f709c9b96c"; + sha512 = "ea04aee1c01d4d545ab4a370e4be4bd23b9f1a698bc660877a754f42995334446bbc08412bc9f8ec92a2a69a6fb8bd0caee40f622813d9ac18b43773c3111029"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/sq/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/sq/firefox-61.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "9ccc8a1870e4882c7862aac6a76677223b73b2087dafe64e26484a9c549479d825b7f566ab99fa8fb85094585e8c457265e7296da3da1c2b1b5980138182c6a4"; + sha512 = "6789f071e366dfb3300cf5057d690c89daafe969a8b8b4e5a3ddee6683caa1426e62901d2288da61b8e8c59ac19d9764521b82f2d0d4fbe375d4e4eecd5751fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/sr/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/sr/firefox-61.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "8faf82d7555ae44d65d4d30d4ed4c97a30cb9ac8ab970f654f0ee0dd5ab1bac8823233a638ccbb591a65a603aff17354eee86775636fd4f458127a59a9cbd460"; + sha512 = "2d079c315d0c66d2e1530cf2d30a357d62f9bb6517abe7313911bcfb5c42ac95c47b3f12f654ea61d2fdb74d44ed0b090443f6ec66ec22cbd51c674084a8c4e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/sv-SE/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/sv-SE/firefox-61.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "881de9734d9d21d7c94257a4539b4c60a3732abb77dd1020c7101e61c88beae474f7aca3f5c8317614308af7c27d402379ecc3bfcbdf5644b04492cd8b57abb5"; + sha512 = "c78e06de0834a84bf0cdd22a46e80901db3dec7d5d9e0dcb6ad850a040e8df6d3ba2c6e68f8a3da118dd9306c7af7f352d9b56e839cf74afd3730b2d8ddbd38b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ta/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ta/firefox-61.0.2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "b3726893b48cb95ff2c4f3fe8769efe82bf36fecffd1860b66f55018ef5cf9e0f6345c1443b88aabb822945bdb6ecef570d7590eb346a0f6f463ae72cf3849f1"; + sha512 = "d996633ce2cfc9d5766840d5198900a341c8158f4bc00c32ef168ac57a1c1d89dc10e9ebfcb2a504273d1722ed319acb9d9aca8d30257a7a6a01361ae7acbc4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/te/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/te/firefox-61.0.2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "c4cb2a1529a4fdeef248ef530b9fcac8730b6caaead597eda24d165648982bc2231eda8650404cba5465ad7281d25910e64dc7ded802a0c042537ee1c14b9888"; + sha512 = "81b745184db9c550a135efd9b085e074a0dbbce24d81a16a39fb51166233d84da6c61b556e39b2ec68365ded627b31065d367c224721bf9e99338456aec07698"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/th/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/th/firefox-61.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "5275e34f34bded8945cea10496d41834c7a1ea2380ed29bd338cea64b0cb10cb4e0985ea2c4ffaeec94167d224e25ecba68e2195a40915d8ec448c1db049d300"; + sha512 = "a6ba250aa390005ce6830f14a4f7518062b3a98444da87e36f515fe29d3408b7efe9947a9d865a220b9f60ce57dadc12099c5742012981ca9c4d3fcc0ff4c877"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/tr/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/tr/firefox-61.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "4769514468e6653a9b1fca2556faa9c25d8d9fba7b2301e9c9a2da0dc0141eb9cfc3801fae1808868db14aa0ab8b5cc0832919cda86f7306c4c0b922fdcb3956"; + sha512 = "55eef864538b70b8d6e7fc2e6af2c73853a48860dfdb1ac5e4471675ebd2d9f089793c1c6cee713654caaa253b059e9e01acb12aa0f6f4efedd09632d10315d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/uk/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/uk/firefox-61.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "3313520a53dc840cebab96d2901f83f34168370e5c08df92edc996ac220ccf3aa2eaa62e765df0d86f4072acee2eb2a3d513c2aef26d9470b9eccd1baa447120"; + sha512 = "2bf67d7523c9b07acbef099dee48902d19a5b542ffe9eb65283524ce2cbcf853b1e3e862fa2a7640160cf5dec8ad884a237f4bddf215304a458a4d9575af8137"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ur/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ur/firefox-61.0.2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "4bef3bf1d3dcfde97d79518e1d12305949306e1f71e02e26116bca434c6ac4ec3fc7ec7d219ef1360e999c4a3963ab3b1f1034eefd4be04fcf47c4667b426aab"; + sha512 = "4127578edad2690915aae81fac45cbc90694b68d593562f4c55a1545cd1b8cdcf3eda18fbfb2dc9fb3e0dd3119fad09db68d65e6fdc09d96aa65440750fcf380"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/uz/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/uz/firefox-61.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "7dd28ba9c29e891498f6caa7d38dd4cbbccf807a96b0e77f83499159d574b37409304f6d16544ea592c2b0ce64c66e4f4dbf127a9a9aeb17e8738cf99cb7083a"; + sha512 = "7b0257e2bf2edf26afaf6bff2a06f9fc81bbf5397c8823a65ee63e54cd32bd2329ddd858a5e1374df64bd188d3d3392434d83e05d0fcb4a71d0a73bb6da224dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/vi/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/vi/firefox-61.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "a19176978e40e7446da4edbf2cbf8945e5b5acd49acf22ba14ec7649f375f7dd6498a8662e285518361b6080cb549f038e91c02b5f5d5bd88874516b6eab2ef0"; + sha512 = "071e162e6919168fa4858aa98d68a2c6ff8ceeb10e5968a2dff55040613ecd7e7290f3acc929f8f2faf3fa4b97cdfbe4fd8b464f7df0c3d1d530af5a9ca8fd71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/xh/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/xh/firefox-61.0.2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "51149fe6381d6dc077730afc623624a0c4bf4da7f0a28d9dd601c3e2ce80e2ff79c8aabb7fe308bfb1faf402d59c4feda46b56fd8cb183201cc25131df448cbf"; + sha512 = "7e12d3e453216ce6ef2dd56980a130c52e273b23543a3df0b5fb11c69d1366533eb4875814e5084682c54f86d2cb8a304b95b08a66c8595c8dada69d4e97af71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/zh-CN/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/zh-CN/firefox-61.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "e244d0a4ef5beb49f05fc5602866f3e075f0269aa8a606d2f9ebed615de00088108677b3489c0d62c221fd931d22b8e25ab915a5aa51d650aadfffbf59b8ad10"; + sha512 = "1b98d214d15d0163aa91316fc6f507bda61169701a8accac3aa79dc8b6d7260d58813d87ce25d7083f6fc2d2a16519464267feaa3981e2e556298d3cc3f1abf0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/zh-TW/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/zh-TW/firefox-61.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "8f7b559e0ba2235a5459b45a099c8c892a3a3cc1b43d9d7bca4ea0fadcaab757cb7ad8b50f4d5e363214896c2d6b1ad0141b1cf978115bd8ca756f1332d3b214"; + sha512 = "f466df89dcc7a4b72ef7b41800961828012fe913b2eecdf68f442b492109467ee69a95738db2afc1ff39fac0b6376598e8ae5b050aeddd6fe3d40d0dc8d424b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ach/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ach/firefox-61.0.2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "f071c04decd07e0a5a9113d33e149c46666916c493ff5a425daf2bbef67b7f073f529f34244a260545a28b887d42928cb0f9bb3ac59cde2907f79d8e1faac8c3"; + sha512 = "6aafc9db497700c6c91087e2477b707a162447199f26c87a4921b278d81828e868214501e8b89deb387c097d5768faa18eab83076ed84aa59799b24f62a3663a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/af/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/af/firefox-61.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "372f02ad225840314ffc709ed5053efdde3d1917d165b898980c877fd5eecb49918ad8616d326eefd3e6e85a6c816cf82f77db4bea1fd6f92018f73698db8de6"; + sha512 = "5cfe6413a70265360661dce8555941703feaf9045604313361553769b4738e3febf21a79c8be66e24272fef72b41dbf0c3a2e8e76e5b992789250d4b04fda45e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/an/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/an/firefox-61.0.2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "a75046b320adc861eab167829e7d7a8fd460ec89e995f4f1add970dd608d16c0ba4ff7875d0162dbf404c7e0301ae5898f88911e9e4ac4405cb97ce3dd62d1ca"; + sha512 = "cdd9509e49d563ed3d26f58fe957375357fcee36fca7526a20dbd09e9f4f2867c81508cb637cb8d35572bd730b13ed34fceb0af4aefcff631e632bb78a6713f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ar/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ar/firefox-61.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "546e1138d18802cda7375a1e36c5d1751a5621b644b9147035814eeb2408ee9e070183319debcc0a5b9707ec978fec7f9ea787b0c6ca6d4e2a4f05ab7f2f8ca5"; + sha512 = "906d0020510eb911d7b2709c55cca0e4a69638c685bda7e7b406fb41f385b97ed95ee97515693d72f722a619d13583d227264d0819ef973f01e67427a269225f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/as/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/as/firefox-61.0.2.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "003602b08fb96218a0e86a577c466bf4c6d1860165bfdc2eca566ecaa4185c6f73a0763b8dd3b8c3d50b11e7345b42afb20b5cb30aa075d1cd8a05d06f97d34f"; + sha512 = "2fce0d7c990c7e2039a601ec5b5feafa7da368e24f363489c1cdae831bf36a11e2bf967ec4f74512f6ca06095ee3a59982b0a5ea3bd003bba9c3f4c763b9771e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ast/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ast/firefox-61.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "76b37c34a3c1b5f8b55d8fb326709f0aa7141b869890f35d9452b2beda692302024e07dfb7870f5689a47f9fb5f5e4f9ab097b552f25e60dade571d0010e9326"; + sha512 = "872e0b0962b7d6f86663c0cdf5fed6f4927f4a24bfe1848debb605e7c19bc574d98bdcfb74a2e5a4362c27ed1b9372881fc1418c742e4cfa75d15d838cad6f87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/az/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/az/firefox-61.0.2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "4ade37b7cb1814ee254f902705aeb74ade1172267a080fb3dd029bae059819d4cddf34d23872d49c5696aa55d6a49f64a0a00a5ed5186c58f687a614db3b7822"; + sha512 = "dd92dcd6f0c32d5487525cd88832fb567ef0e8fda5cf7f401399992243146bc2690881839d5752ebafb4e7e099c6594c71ef99d5509d94753256507216a2532a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/be/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/be/firefox-61.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "6352d3e4495c184048157713b4a3716cc65d8d69478a22b93937c545663746c9bf3303935d97e4f1c0574f3e22c4b06076405b31fdfd5a3df3f40b3b0b1650c5"; + sha512 = "1eda2b0945a4d8e70c0e61b187abce6873b9a8a578c089cb66b2728bfc71b90aab71b57599417ce775b4d5fa1c0fd908fa4b9b3183a3aa570da95d4fd726ba84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/bg/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/bg/firefox-61.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "642fd894a03672a0b91606bb7f8a6039566d007c3f90bc680db208bf3ea75327186e6540599db6c18bd76359622184e9642e6f53a9baead022fb0cf6e8ff5315"; + sha512 = "597dc8972c670f67f34ac23ffb57506b896efc9436d36270dbcdab484dcacab174aba53671f5462ffc7b54b9718c0280a66734e789edeb7710cd7c2b9fd602a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/bn-BD/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/bn-BD/firefox-61.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "bd9a7d34937da1630e4b621f70942c43c6242bbb7ae6108df460316fde6686436b22ffb5416082d483a81296b1afa179391fce40ee21800e5b984827a5dd20c2"; + sha512 = "79989196e4647c035d4af9f24dc9edfceebf9d90afb1efe894e0a54e940ffcf32e3746b9e07b486bd89a11ef8f35cfaf2e61992071352a561a535bb058c0396b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/bn-IN/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/bn-IN/firefox-61.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "a186b8d943d7cba1ceb768aaa8607bf97228ac54236ef5f3b71b88eb2d1d487f69250fe73620dd9b4928b5d12b66dbe3531c4643f4e6eda6e1851289e5b5cde4"; + sha512 = "25b3d138308e0667d62e41a8384619fea548dfe441cec761c82e238c1f0467300d6abc89d265f22f1d9699ffa2165bbb7dceab76169a78acaa4bb1c46396182e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/br/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/br/firefox-61.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "dfff029c7b96118394dfcdd4feb19c0756bc3fe8e8b8761f16767280d2bb97b1643f14ee182ac30f52d0da1f4b0c984a09e43c7ffd14d7e1b7aecb560597d1dc"; + sha512 = "8f18a08ed64cf071462b2eb65e0965f4b3825857e867da2898f959fbe84ea55cf19fbed289a4c4e739e5c4fc5392f1f496feb6b4f383e86a753f5041dfa333ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/bs/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/bs/firefox-61.0.2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "83802af9571a658287bc8753c3dec0cf077d1a0e09196e965f14f172c7b76172d2833a2096f71299718e225dfe3c7ffea7c38c4db1436018fbf2228b0c981499"; + sha512 = "2cd2a33ff71b4a471d694912f8c102b53327f1bdf005316e16d32ef17a510784cfeac972f9a854304b07d6c9d19459b19bf3f7e47caae2e58a635fa555115039"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ca/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ca/firefox-61.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "e850371abda2bc4241fff1c6e9b79618d378a0efb266f4c39239aecb3d44ba42b0cecf71183ab0ad6de812e779376c2a40e77852a436102de2c038dc7e7e6ca9"; + sha512 = "78649a90b8e890adb271fc57328669afb49f70e9f323a2849a2071b83125f3f1f40e13beb353336a9c5aebd930979889c719075b49ce4099715951164d979926"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/cak/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/cak/firefox-61.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "ce33c245d288e3ed52958acb89be5152fd78b29aba3d83e78543cb48c8424ed647c2ed03af0a03dfbeb3a3f1f89137492f1694633edd68c5d22ed66f0a74aaec"; + sha512 = "8e66b6ed5b20efda281350535f2b08892763c2dcb62ba4fc764b598606a36b4a6f3d5960919a8f2967f736add11132252449efc4bef827653534b45566ff69ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/cs/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/cs/firefox-61.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "3d012a8edb3691d05426a236dfddef9841f56f1afb59a4fe00a710fbb3060650890fa2e766e6a42112a4b5c07b19b2de10f6737e630a05f89b9ce62a336dc2c3"; + sha512 = "5e81414b8411fda775b35704de90d006be40cffbb51b495171b9f69896b9d486e4438bcc2bd2f3775ab5f998b7b41599f44f92ee150ddbbb2a84f64058657938"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/cy/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/cy/firefox-61.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "86e7849fe9edaea1332c98ddd4286b75bf5814e6b74f17fa8b47015a9534a548390ade8278fb600248dadc2dccc43e7c4f1f5aea4a6d6e299bef34e8911e1be7"; + sha512 = "8f4c5db5c760e16ef258bf2da401e51c2cf3d75808d83eb4b7adfaea4c2b69bfca0cd92c9cf69d7e4de188a2c43574d37c49b3c641dd9c8edb7bb6aefd2e4755"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/da/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/da/firefox-61.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "5dcff5b9527b76a39a3e932be37af0a4faf32a60b32f4827136892e51c051c20606a91eea7767c5d80b0a2c97a7be44e7199d0ba8b20417b297cb0637c8cf725"; + sha512 = "4aceadbf8cd2ced63f15aed369d98f4234faef18560e767aab1026c876fd3d6a069cbba49139eea60a78e0e42c063451918ce4090e850fc5528a93f527067335"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/de/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/de/firefox-61.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "34eb449d0aa62bc473413b0e8e21409ef9a4d2d08c7bd5164a780512662b2ca8d9436eb059c47824b4cd50c6502aea9e0aa1d198561882da1018aa18b72a8821"; + sha512 = "327c8b22f3ff3c11061b5ee58d1ea2311743e53d804bcff6e66615eeae3aada694c8adbba58f3521b6bcd8f54513bcff1d50ac952ffe5f1ff3f22b52264bdb68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/dsb/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/dsb/firefox-61.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "5d9dda0e61b5a29d62516996ff0e2cca1f535c5b0d343a5382a6b07641f2122da9aad42682e70d8b5f20b562120190f9a1eeefd5a2efc1f119bdf78e86f395d1"; + sha512 = "5a964d9c25326d2a97730723be2a999bcd8a1bc91b2d0d7ebb4aee9bd773fe93cdfdd94c70cb2f9c0ef10f84474c28726c21c23e19a1fb9b55e6db5c2a74b6b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/el/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/el/firefox-61.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "b62151ec4a320d6e1a92d47082b0bbfc141958424674162056ad302226717ef1841a54da07824457d0ac6e953524ea2d617695b0a369c88ffc75c2acaaf3f702"; + sha512 = "ed1eceba7d5bae11af3a916902a55c66ed97ca6da9f1a6421e4be76c65b25111e2ca7c979c55f920d5fa30146016980fde273c643a5ff4996ed32b82f0b9087e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/en-GB/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/en-GB/firefox-61.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "b031bde943a2b3d8863dd4b578c2d7213c385066985c1aecacfc06f5dc45b00893382c1e6c157bdf6b889a86fb580b575e81156f29a475ea47e90e2e6113c3e2"; + sha512 = "019be53a2e1bafbc4ea77730545c40be314d7e4a370e5cadaffd735a2dcb3dbca14e4d23b88dd2e34aa4518a57aae1b37ca561e8e62d7acd3417227f0d18d344"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/en-US/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/en-US/firefox-61.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "38f959e86d5caf4c30bbc8fe4b2c9e2451c31a1b30ffc0fdc38e92d8152580c8c2fecf7c5e4ebe86fc41e6b2f7f8691b428a691d89744308e9e800633df1b022"; + sha512 = "ee88e6d55855a9e2fccf2a362f26177393447dd1210eb8f78992a7760bd0e8245267c4143eb5309a7ac5826b345b8c9637bcc504bb7214d1f7897db70e9c7697"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/en-ZA/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/en-ZA/firefox-61.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "6a3b9855ce3fc053ec5cbe65b177290444097317f40da1a19cebeeac83f78e5fc3c74086b15c5a4af80341bd16319d09b0def2d3e2b65b67adf57065021c5479"; + sha512 = "877cb9d50e95a8b0789660d871f263497279ea229b11218bc9398facb23d78200db4ad19e0030ca44cf36ae3913f8a119abddc3278e85a4c89d298c59a3443fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/eo/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/eo/firefox-61.0.2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "cec51b0e9a5a0017171e724337e8b5edba7bcf4a2950061b4203738adea2fa65991bb9012ad84446fbb4e837e2feb01e1128ba424e6b0936dcc1cc6dddcbdfaa"; + sha512 = "5c78af15b977019cf7402e88b823ab2488b08ba9e8dd27a55caac7570392e78afd8aa972f0f95f21dfb1239936ba23272ed5b84cf24578cda5e7bb1048ce7d67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/es-AR/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/es-AR/firefox-61.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "a659ec66e3bfb25c51765490632906e320e1ce16f81e16a528c8b48a383f264fa01694e7906fd27948d4ca97289e240f2a45f4a8afee3340c0152e053108f621"; + sha512 = "8328fef71e94c07c37491a331ac362d142d44e93404c0a3ea883426c8f11ebf6f5bf6584237b7fa75439c7312bd1f33a2ddcfcb8882c3cf3c526abfae48a620e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/es-CL/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/es-CL/firefox-61.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "2d1dcf65d150bfe52743b251127743aa5fee665a4d8a69d8250d629fb48d99f4d6af06162dd19011aac8d1d6dce22df5b1d5516084ea238342e14bc008db520a"; + sha512 = "ef4e96123acde3a3ed75d8d93868894f859349613b556d44056009d55a3794e78824928eb04afe8746e291fb3d443b7a1b6f63376ebeb65102f7e03067480b86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/es-ES/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/es-ES/firefox-61.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "c843d1f6ed5175e8aff02e0501e377ebfa4095f423f6c8a069166c38fc417fd2ce670d1d23f2d00ab927bf2065103cfebf4e7be0acb803e6e448f523bcae0177"; + sha512 = "934e92d37b920ccb715a411509905c150501eb14d11aefd084f2639afb8ee1a4ce3e869d682ec9f9db4b70a795875f09ca3d7d997f0e621ef99cffeeb1675f04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/es-MX/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/es-MX/firefox-61.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "274d9c8343ceb3f9f9bca4d1664104b1ce40e5dc47bd029764421fe88e0700f5458d9a82848b5c35acc0f4a2b9e02b5d651638e71dee877ca7a1faa5955d0ea3"; + sha512 = "57e7bacb006bd079554670fc216ab2c1912a252b7966b32cc25a7d6735f7b0928ae0911b666c2810c63031d57513a4ff800cf92906a95868aa32608eb927e2f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/et/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/et/firefox-61.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "30b7976181ade5c66d0f6e0239919e490b9082fa36deb1d483242d83b5cf150632862237d30481f8c8135fc00ff977a9b7cf1c9abccb8c2ff7eabfe5052d0c6b"; + sha512 = "b357f29c0f77e7ed4ac764f7feab6588cf322a1807210052359402e5d1092d3d8cf515e04beac86d32a6ddac43b4be8b92d88a1437f6899b4007d2c9faeb7fc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/eu/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/eu/firefox-61.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "92136a5d5dc0771be51a18e17c613fd921a99e40bf0069f2ce638c5c1e3489b8a1be119586cb4d8d7e57dc7132641158c3e5046e64c4047c5be137007302afa2"; + sha512 = "61b4a7b767e62b1a1b4eee4cb024e869969b5623de658ca2a3762c271a6519fb4869c9398e7a3cbb987f01799961021fff6f8634b78dc62770ca1f345e56d061"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/fa/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/fa/firefox-61.0.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "4911024cd6035415f4efa7fa1ed4e69d4af83455119477dd920f34626c941ee96177969c843744b1336f8ed557a2acf8137d5965d001725d59dbd0fe75ac68d7"; + sha512 = "4eec6e7231fa548c0a24b8904b55311058dfc89b2ffb87142859b994aa0a31a07c48107495cfa66bb4a65094328f6bbd7f33e0ca33632457f620ecd90678552d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ff/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ff/firefox-61.0.2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "244f8cffb392dba35e18faa76f1fac9425a8389046953c6a74bc4776f71863b2de2bc97e0bbcef2b02929982541877245d2a1d5e749079b64fac3e461c4b87a3"; + sha512 = "0a17ac2aa0a855c97b613741d7933dffc4569da9fef9f753a4e404847e683cf10a4444ff4cee5b5d1f86ef069525d0f2635433e8249ef029bfa2c247ed605386"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/fi/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/fi/firefox-61.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "b3cbf12bae53f19d8ee270458ad57d563dc09a4362c889b03c2135fda52964822c77acf444cdcef2f0a5f01e4c6609ae65769ffa0533f0aa22a73fabd51d8de0"; + sha512 = "32526703d86dcd74739f419518974ba7f43083a8b3f971d0dd7446caf787c5ed4be82710e3bd53f2d1e9e5dcb67f46735bb55f60ec7d9c49c62cfc2857866fc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/fr/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/fr/firefox-61.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "a1f09c3e1bde95708a97e7ce579af3e2c23fafe3715ba34e98f2f7409540b9a59ab4bd932c89d30c88d0689cf4d1e58fbf5f69e3682da39db5a7e460d3cea015"; + sha512 = "b7e00691c8a1a5f0c1a6312a79eb40ae17e455e156f66da2f4e43beaad5ec35d770b783aba83c500db1fa885b1038095effe69f936e17d69bd320f41b71d4b2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/fy-NL/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/fy-NL/firefox-61.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "050fd5cc1460eefb184d15497f3eb0af89a4796a80e556638f03263dc80da24f67a098e527a7d9d105ffc8381693aa8cc92140d0c51fdfe091697021eb526669"; + sha512 = "d8d70ed1d04686cabc9862c5cad06dffa6fa8b975a2a61f0154a6c1c6b182a173abe4563b727de30f414a4d04311744917a82158665883697d26589b29a25263"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ga-IE/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ga-IE/firefox-61.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "95aa5c888b0c8d249db2faa39cb42b4c004c4200da6b3854709cc25d12654d70b9fadcd732141c8ccd81bb1352c7c627b6665a9ae409ab87f1acfd4e27900cc0"; + sha512 = "352620fb58ed1fc024e8633e70ce3a705fa518cb8f600b3bbcf1c50c440812ab8f04608bb5a3582f96dfb2a19b0d52debe6c4947dff2f06f426710d8f927977c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/gd/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/gd/firefox-61.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "2ff55c69c3d7e87937b9a08863bb69824e07c84d9b433933fcb48058ac7973d1f8da67058220a805e1deb0c7f1ea25551f8f5e790a54cf0c18c2b38c83680cb1"; + sha512 = "90923e5ecaa85d21d7d6de57c79a3f35b329faa14a74e8b210cc2024f1d48f3aa5c4930c63e8e1688778bdbe998f06c72b5bdce8287ffd7ae05fe62845ba2bfd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/gl/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/gl/firefox-61.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "d956ac5b55a3437b00502823ab79b879f4d3448eab489e62a73520e56c67c5abf039badbfd1271b589baeac83025d6396712bce3d3ae1b4bff4767cc3ef08cdb"; + sha512 = "339f8ebd6d714945e50be0d18be3af010e2f00924a84df2fe5641b06842278550bc76b01474ad2b2a0feda734f6f2ac9254c008c3a6f942714c684504bdd47b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/gn/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/gn/firefox-61.0.2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "176a71c3c938e602cdf4c693a6f5f4a424e1984fa949265911ddad5f9babad588318849f5050051233fcd077584ef9c10a76c240193edfea0aac6a960d739d83"; + sha512 = "35de07bd227904bf0372555d81ead164d993410d963e0e733f536ec445112652c04d3bce8f910d0b3daa3d9ef2ff956d24ed680916a5e86c3e9a6f9366d0dda9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/gu-IN/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/gu-IN/firefox-61.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "fc054c9c78d3705407bb388c0244cab2ffc941f7f4fadcc8c27181e720f40c1b6fade221b0ee9d2d833bffa1f09cce4714248a8f94a1d199580e99b63c10cf02"; + sha512 = "20b1b40d84264f0e98ab91a4e5943da078b7c37816b24443f8936933d779453d640b26ae04eca1b24b3a68134a29e7853bbd544c4cd725b934660574c6381284"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/he/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/he/firefox-61.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "1474c09dcb6f0aa2f2637c7ebd69eea0ef0374218138a1a3d51c06034a3803d47a82641fa3d95a1e0c960d72413ff68e8937fe3602abd335c8faf818184da3f1"; + sha512 = "f8652f2cdc19827a7f2a92e6ec251c5f0bd8448d3dfaa3bd930a4ba116dbdcdd7f2a9c083c5fa93ba2a24395147782146c5443221c6183622248e54d0687f287"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/hi-IN/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/hi-IN/firefox-61.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "f0ce4bde052f506464c7a67b289f1202a8ffac52b21f7a0deb1a4a93067f9a9537d925390548924effb15724dca8a03bb5fa10eb991ce90ef201ce7a6608f3fb"; + sha512 = "7051302d9315dc30fc8f6ebebaa587b49d17823aae7a542133d2f82a1d5a18e3062ff02880f347518e5f88a0de913568d9f6b4ab72bf7dd20cff5812cea65ebe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/hr/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/hr/firefox-61.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "46a12ba74472f1d1698d62b32a3f421c80a4408ab98e5f72c1e221af89e9a428055a73ed11a9e5e909c27d89a4b03f230a2f55205b425e877f81bbee3a503f37"; + sha512 = "acc1297166057cdac0015758d6556bc870481d96951e7a14704792e39010938a6c0bafab2cb28e9a23bf24695813e8dc1a80512c1c5fc75bfb8a0d29f7091c93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/hsb/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/hsb/firefox-61.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "d6e456e80f4a0282091cd6e35aa75d61da9a8e5a02cff88f2c102404888b86b80ec3b0f5e3bf1f90f7ba207c9ee2ef5e83f64ace8d3f3d2f4875ee97d08d4243"; + sha512 = "2ec761ce5eaa14cf5fa114524f70b93998d76971de7b8d001e656cd6331c32252ef3ae78f54906f5dd416896b2cf8b6f5afcb5e3a02d017d9c8a33835655718e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/hu/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/hu/firefox-61.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "1f1b201d42db1e6122aa7575e1a39ca3f2dfe0a896066080ddd917b5f37d6da824b483ab640a38431e2164a918d804a6f6647b1c3456f9f09e5e89dbb4b0de68"; + sha512 = "160d7307aeb834f9ac15ad77c0cced4cf7abb855264e10d8a62eea1b1ef85aa3b0a00fa9221052bf4a3df010e54fa198d7033d8450d59212ff36c936d99a1469"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/hy-AM/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/hy-AM/firefox-61.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "0f99f6dabb425c27f3f6045413948e8e10c4b765c4104a1bc4c2a0e39a78495565a7104c1cbf8b47dfe5c3e9866855f633bc1b0f649d22864d4688941edc4832"; + sha512 = "09950c9536fa0bdbad207b84ccc83088b23a7f2f960d094ea0615de566ac1bd9cf55acbe01c0f574114dd9246bc74e582e67706ec0c34a2c9ed6dea3d30bae17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ia/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ia/firefox-61.0.2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "3d192886bf01989adebce0582c9fef6ae89b06043dbd5ec5b0d3ce8157e08b288007483617f55f18ffb7a98647f31a856325b3974d446f7d4d0b0b27c619195f"; + sha512 = "e6c1b00971dce7387e183a8328234ba65722c69c7d48e328223eb7e490af3706298d43c11844505ba2ea5aaf21a1fcf7b3cc8ec8946862fe7aed8128e6c6d5cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/id/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/id/firefox-61.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "a82f87671af899d82cebb1745f8b373390982f7b0a7aa08e2f3b4fbe1d3ad4cc5356277767dd3200b794702af2895e43e2443d7a9fe308d7671786cdcfbea8f5"; + sha512 = "85506ef07ecdd1d466fbb261d46bca8cc4ac8b3a707f27db9083dfe1996e5214cc0e78080f33c2b3198e27e044c6a6d13717d69b43c3ad98a1c43f50b12bb69b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/is/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/is/firefox-61.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "e89106d20bdf294de5fdff8bcd76425377d6154677f114547ca239a388ea78d4a447e8e6d7e0412ac438e126c4b6b10a869873e2da59c1df35c45e62dbbf59eb"; + sha512 = "973b863ef94121836f472f5450f8a1a2d3329306f289b8ba09ff811b336196a157cfc966fdffecd54e78f4f48508ca1f8284f0c2d3804579ef82be4e1adda48d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/it/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/it/firefox-61.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "2113ee46a7f2122300ed8bb84f3a5bba79e895e1d8c0b2632f64c7227ae815a4945a6c9c41bd504c8800deb2ad48956295fcd4c283227a433d7e670f5a5815e7"; + sha512 = "fbb8e899b2aac3f4c64ccde0fffa11f8609ca3b7ea8bc05e062d207b46234b2414746822e0fad8d24fe8ae43e3bd8ebf2fc5d26a02365012a95a4070de002274"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ja/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ja/firefox-61.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "f06a1380b6a3e00afb1a07edcc3580c24c70401ab265fe4f9033fd0ade365b522eda4a81531bd5d42ebd4ae4b8661a0cb1bf37cf6db710376946eb7d9bdeda47"; + sha512 = "c6585b28baaeffcdedeb1167aae4d20874755e970f53aafb351a31acd3933e6b805cde1e22ce0c2ade58984ad940a5d8b6857116f11ea6070bfa88c8232bbae8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ka/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ka/firefox-61.0.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "834fd967a81070bcc1802001726a9e061182cf30a03227d4713b9d59df6e3559acccfd665b89b8b63e43764d14e37f0e5859075e276c67bd6e0972f608e5df8e"; + sha512 = "136f49750c33d72e7aee3fd5733730f1b78d6656fd45b2aa2299d8e9d01adf13f9debe1d08d8fb9149107e96ce5f5fefce81b5d9a2d9a1e1896cb8df3c588829"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/kab/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/kab/firefox-61.0.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "15be0475321c0a7542361afcb28c5ded73b71bbbb504b4fa4a4a03e37178a5ed341634278e039ecd6f19c6ff25930a70f93abf2b7fccbe9faa9748134ed84ab6"; + sha512 = "2a0fd4952c493a4c22e76135efbf155962fb51444328726f29660cb97586ba76c1903d28c7baed9bb4815e57747b5a009649e179971b3c7aafd19fb96be23c75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/kk/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/kk/firefox-61.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "74e0438fb6c73fe86246e90ac4902a0d07d3af65b11e76260aae00df7c4e0f6999ee63d3c88dfb33390ec480925d79e017d6aecf916a18cd7dca7856823a621e"; + sha512 = "0cad124b5e3d995124057fe0d818121be4f7f186c7cd4ada4d13b89ca5d505a8830525ffcda9a27a0f5f2241fb65b44b8433d95221220740ab8643f374c938ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/km/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/km/firefox-61.0.2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "2090a149d0a7062c62e0a2207c9c9d4de1ba9121898cdc0f820e4aa893e9af2937769b71aadc150c9c543db9fccfdfc5a027ab25e5b51465cadc591ca50df0c0"; + sha512 = "06a58d8d54bf641e3ddc7fdb3417f8a5a2aaa16e8c11f961321c939e803249edb7dd3e08027a4b20ea840298b4a12da20c2771364d2b9caaba496d1eba863e15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/kn/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/kn/firefox-61.0.2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "0ddcf94f52a3cc68a0f92aedfe4b84cb739967566ddb8f9fd67c151efbb3c5abf10a841a799a13280c21c1a4a9e2869028cb450cbad49fdab96b4ad797bba327"; + sha512 = "92a9d9e4fc65472200f408238ade4ed23321d4e25b0c7eff9096f23f76e480cea0031159b53e509cc6d3d6b2c0c0c8396742c81f2fc3e9825c1d5e45a35a12f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ko/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ko/firefox-61.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "c53b45bcb74ddbb385360607662b4ca845099ab3f276cf8dce4158963e90d3d17c2aecb4a5b0d4ea496328e72f6a1268d11a08bb2f5459d77033dd10fe6330c0"; + sha512 = "dd9d7674f6261a94cb00fb823a02cec12758476c1ca1cf6a973eae78dbc1c94ebfcc14155c035966781398e1d3262e000da4291e90ec434756c8c3ba0de7b7b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/lij/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/lij/firefox-61.0.2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "d7480cc04cb4c13ddf7707be2b0c70694863aab289a73f28fbdea83363446f635ec52c8bbded3ac9c72360721a7adde9407da82816318bfc6dabe1e208582a23"; + sha512 = "1d01c34ab89ff1122147685b0551aa650f5b751deec35a5e7d64d6ba46272e929d7f1c49601fb2b1f5514b840ba6554af892c79c1a3f71af392216271d206cd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/lt/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/lt/firefox-61.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "315c23da9ec3b270ba8840c8fcb5c34fba57b87319f499a64f140fb0e9803b229831b4366ed68287809a8a0277d3db955ffddd4042a4bd3f0f453e22ee97ed0b"; + sha512 = "93d3dfaca37a668eb7c43bdc74ba521bee0344fff43ff9cefad5e4746b7c3ccdba445f97577338606951a15fc5e629bcd4b8cb979842fbe550d3e7e88169b3a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/lv/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/lv/firefox-61.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "b7af965deeecee3f907a0b119c886fe5c70ca48ee3ecb094ce052653e9241f6754f804e7b8513c57f060dcfe382949dbc69a4baf34875d5f2bc3fe452b3e4e28"; + sha512 = "0037d16778bccde9146965d7553513a21a443960cabca4a65b6f58ca2ea9f243b3405d3993e8ed078c1a2b7bd636deb86ed829f8f699400fd755f35cf048c463"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/mai/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/mai/firefox-61.0.2.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "def09aab80c64677ebd5088da465d7f76e56c3594c88343ffa39ce67f125086324a3e75161e3bc08e004a48555d15faf6b568357fb7909cdeb53934af6879696"; + sha512 = "d8025e4c4ab5b7e9b2d8dd8afbc221e1765eddf878943c4daece0e27b7443e7e17de3e400d99a5ef5b62a5ba9e3f2a4c27112551c8c0ea1f81136d6d74b7e91e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/mk/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/mk/firefox-61.0.2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "51fb92f31ba8d0c7b5c27f54ef4db116be1266e3a23514b39b8af9988c8a72302b9157640773fbd4f0aab2f76d586ea2ee0b78fb4aeb5304635e7dc13cb5e0cb"; + sha512 = "6ed44201501bd8336615b29078de4e52374712f857e2816732277cc37b6f8b305af0861894f3f70fa62fe2de6476d689bc5b79bd245b4dd750dcbab0b448c69e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ml/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ml/firefox-61.0.2.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "389b1ebad514f54484b2af8991d358dac58213a259ecfcb979561bd09954afba0594d9f0397c8948ce74165191046612b5da3c09d9c317118468e6c751177730"; + sha512 = "5b7272acc37c4dffc2421824b86c5f0192b7a92535f193a0b567fff8e79129f41bdb336bfc1c742ea0f106739eca47339d9f550b785951364233e612b035f94b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/mr/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/mr/firefox-61.0.2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "73ef9e2b717992bcd196c60f58ac6b4867e094b16ce0f6a919c32e159eca98993415f90e9edda96c64eb6cd1c0769e4b1fbc2365be41f0452ac93e657ecaa3d7"; + sha512 = "fff73ffc6f080aa064df90a2f19c85364a09c831a095bf3722a5bc0760e04e305be8683804883968a492589a652d705f1cfbbed617de2f00348a723babf60a86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ms/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ms/firefox-61.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "bb19da37decb720804821cf5a4ce295bc385b5402412ee001e43a15f0943d56aaecfb94ac3a761170f2b479a50fe58bf2fb0ec6f318fe68bfcd3da2f05ef1919"; + sha512 = "a7574ce597a12b92aec0e88ca72d544cca1ec1a5def40b034a8cb25a24a3672c42e2fbe7ebcf0b5293f55fa12216856503af5514c3ab2b3cea551a8a43900b04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/my/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/my/firefox-61.0.2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "17b96fc20d62a938e92bf8f6659b451752700292cf209da477571945a8d126784bd3e5ed75e27feb5c4b75addb64b45da2a2dfdbba98f62b3508a74c0a681a08"; + sha512 = "0bb892e7ab8126f2f946b1d3c9b8b00119dde0a165832ed211265be4f698087ab83970b1c1d47171913db7e01f43036e90b4aea135accb91c33beea1031d545c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/nb-NO/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/nb-NO/firefox-61.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "a99b83bf5b85b44c46166448fb56490c020a7dc9e7357c9b4d5abd2552f91d7ca6f9cc445b8b2255481aa212b7ac1c9662e5406b760922d3d64c7ae611823bea"; + sha512 = "184130d826eda76da820974a4f729de6eb569bbc7f36ffe2d4599b7c142d75c5537546511770db38abaf28b9d3866937fc6d51c7fbcffb074432da3d98310b06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ne-NP/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ne-NP/firefox-61.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "6d8ad313b854fbb564f06d3ffae52f90ac7bc57620d0a642874a1eafd950966471cc201828045e5fd005a7cb848f37f77cee2efcc0f19dffb7f02b391fe02acc"; + sha512 = "2428dc2175f0da8e4fa66ac11810467306a59b181c34165e4a54dfe5f3bebc182f0fbcb117f15707e72baf97f4d75131a3ec97d03d0fc1109229caf83519dd51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/nl/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/nl/firefox-61.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "d8fa336c7084823bc3430d0c11e2bc8e38874e3ca33886e48a1318ca2d5deb7d0a523f9b7f8e86596e456c1d4f899edf22af2058a162ea5ea1266596a812aeef"; + sha512 = "96bd92c9979e02a13db550f7f3a795585baa1017691371c5e5bc99825d730d535c63ddbf805ebf8a0e6406ae80ec644d0f715d04f913935f845ad89467c01832"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/nn-NO/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/nn-NO/firefox-61.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "69028673fb57cb9fb7d87d6e3bdfabd5e530f51680af61052791a9a160c6a8a2545c9a4e5bbc3cf37d6595120641f20c4514dad59ad1ca4745c8fd5b72fe539d"; + sha512 = "26f35cd02873ba061cd0f38cca18947e2c05589d3b399c55fb4d0f356c26d399848467a20fc542c7f51c67c912ab7c8fe5fae25c97d942260276faba40d24c89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/oc/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/oc/firefox-61.0.2.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "5d1d399dc74ff5cff63e460ca223c11e130ec2fe96a974262ea47a055899a6ef875aa4e554c1edbbedd0b5fba66270c5664a7e66040e5d59bed6cbe3793b9a84"; + sha512 = "711b260ac771280d795d6e3746df07bed4b9357b7261e83e8b17934ab027d77bfa1781d3d9d1923724f49f16136468c1fef40d1809d6a020d5b49b7767030f85"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/or/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/or/firefox-61.0.2.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "31b555805922b46594ec82918c70a1862ab032e6a593b1b72a85ac7852a4d49dceac2ea76f2ca22d0b648a5e3c7636611bf247c4ad4133ddb5be309b99768da7"; + sha512 = "dcd1d7068c75428533d268b50d3d1e7324dba2709abe4049c9cfea4fd4413b09c3c7dd9f944f5f54f57454d8d2aa8471b8ba5871e73cbeae6fa357c8c68e90fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/pa-IN/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/pa-IN/firefox-61.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "62d1d01fcd5001e108c17b6b6a5828f387b89f1c1a77f954dd31a88d226c355086e5246e4c9dbcb805a4faa12ebc9662270aa07d34c397ca43cf0daa1333a106"; + sha512 = "f34c32479a92cce9fc6564899b5477fdbdbdc868b17904f8d7ae338c2924fb7cb8335b038378a805a2119ff5ad13e349c7b80efe7a29add706bbaf1466d623a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/pl/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/pl/firefox-61.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "e2f51335bb4ab71698643599689865d56c3832ffc4e946ddbec63109c53f6dbfd337473ef7f3052fc63570c8b3e029cf68bcb0754916bfe3cfb2e1c774eb4435"; + sha512 = "d62822aa991cd30cb6c5e47dc211bd4018de427b243543bd83bd166601e40e3bed35dfc073660573dc500ae19ead2dca858041a3b80bd616def3c2b3f72aee11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/pt-BR/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/pt-BR/firefox-61.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "55fc461bd3016d633471a999d6b9cf58b64f7ed243ffe7eb00e95b08b94e3f774ce300b6745cf2eaacec9399df8c905a0c2c621659db15e1bda0faa3cd747006"; + sha512 = "5a2ea1494423a5ce1afc60c2d1a4e53ef084a02050ca61a688ecf18ff9d99e43d6bd334683937c12965767e7e5b0bd1a32708f1f2c2a241db1f68271633ace66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/pt-PT/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/pt-PT/firefox-61.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "d29373018e02b47999c31f80bb5be4b04825cce738451e81b1c3a9454f6ce278f027a7ea6dce97d49ca795495920179b1163a33bf2a04dcc64e1c4e86ed7346c"; + sha512 = "83cff834812ad238b103fcee8b801e46ae542eba3475709e04848f18df0bee68075b2834ee871bfa5eb58ad1ec7fb34239d661a27d0dcba17e6c39de8428cef6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/rm/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/rm/firefox-61.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "02853099aa53ac35de59ceeea533de72eca31897b0e46e503870379ea57829d8e298bd39cac55cd6b42ae757617a2ab7e0d65566422c2eb23b8518bb38f6acd2"; + sha512 = "c4190e7e2007805b2c7507dd26b0695bc5d3c007eabd6a592c283a99cf0495ce1dfcd6dbb1e753a990f64466f24618d3b84df617f99fb266ceadf32fcd990af8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ro/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ro/firefox-61.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "404a9b30e228eb990df49126a1066b727669e4f76fbcc0ac90934539393a56342a01cadc46293b636edcd9fa11ec629496a822c693da74f900f322ee19bcdf76"; + sha512 = "292112e0af6bad96b97bb0a1d58d0b7c9d4cb476cf531b1caaffcfd54c2f0ecd72a4311f98b614d7f834ffe2779261f77eb43d4d7ab724378dc6b7ad83bb1840"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ru/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ru/firefox-61.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "62d8315cada27354c4d59c94d04522954e82277b245055262e856e6c98e967e5c1fd84aef1d5893f51d92d567e6a0992c7e8ff1661620af6b1980b32d0982fd6"; + sha512 = "3d6fa0994fba5ff988e281ac4feff8655a5353ebf0d99df5ac7412cff2d19d478a912851d27f2af5bd78fdbc68030878682bb7ffa912180d2c4aa9bafcd77cd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/si/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/si/firefox-61.0.2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "b7bce8630eacd3b7e07cc355068a0e9d432223cec4f5cbefc4f912dd1a9aad37dd66751c3ad4192592b52391437f2fb0bcba96f6683e83e63501bcab52f632ca"; + sha512 = "e6d3c4049f267e68216e9824743b123539e5445a5d53297eb8af33af95a418e492a655a456970d02049f8969c81c0ab8c5be1471a5ab8e01b4744995b799158a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/sk/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/sk/firefox-61.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "1b5fcdd53fa59a14645494a6a2bb2e2050c9c6062fc446496888dd64e555c2326065658e622160fa02831ca073b5c3e226de5cbee8b42678a5bbdcdc0ba52d09"; + sha512 = "66fc1f3f4fb7dec1c261db144243dc0647b4dbc4257de93c5fb017ae616d31d6825fdfafc30d3fc299a278d5fd51731f24e6033cb3807c69ccd1512527029063"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/sl/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/sl/firefox-61.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "b539609ccc63eae0ab092b5c7d326f414c058c58fc5188e1a55d81478e1305b612b5e7bf32f071bf71d15ddbe36fd2d09647beaa913c624e30b68bfecb52b09c"; + sha512 = "e089b96b77a60c2c8e96f107cd26f37e681f8a8c702cf32ee3592344900c81daba274516c32ac856609917a30f8d60d853fd649fe575c3a2915072e45908126b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/son/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/son/firefox-61.0.2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "9bd817b0ae3a80472a3cf1ba8f8c6c564bd09fc92b09c95d97008cf940a663f61aab6e52ee99991be148a54296c5af38c7105ab655a60fb6f7e171b0b2b94880"; + sha512 = "00eecadab36816ae5e977dd50f335222e1fd8253b98daa1f14920e48678afb22b0e619ae4a86e6a45c8d2973f83f614f16a1f860e6ed1ed488851032075d6c72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/sq/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/sq/firefox-61.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "c066ae8b06bab9c27dbb21f016d860c67fb63402b899d06030b821f61b4bdb1ed0cd946792e36203a2ca32d86a49a67538da24745133a36fdecc654726f13235"; + sha512 = "ebd8ed00c12288a3ae4f6a113bbac8595ea9c0fbc35575115fd019c6158857ad083588100d4cae440822780bf25789501d0dd800bbe2baef5f037fb43aeabb74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/sr/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/sr/firefox-61.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "8853eceb13dba82f95382592009198eedf465618be213659ecb962fb3590451aed7a45fab05749c77f50ef6b5f188f60d15c92af37e6f3325661de35dfcb2d71"; + sha512 = "bfce8265755adbc3c30d56a1e4bbbbb14385ddd3d2434b6404b04e3fa3120d58b32cb9e598aeb1540f23d2757c23fe903fd5c9d5167db305a88077e98d9a39b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/sv-SE/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/sv-SE/firefox-61.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "7898426b4152fd469fed37b8e84daf73ac93203ee3d625a3efafbec1e2f910e321300d94329115736e1f800d5c538c7a43046e184b932e05b580238faeb63109"; + sha512 = "518b28e8f88a763aa09c5aed12eb0f2b582f84770401f3e11e5083fe69d176ce1483a81c2345a7fae2473551bf41db6a35f341495eb59c559a99398b93a7195a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ta/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ta/firefox-61.0.2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "cd6248f8946bec179a192411a0f81b48ead19354cde614f1260420b6134b69eadc23f278489756ce55d3a45b94f0f7b89e4fd5a08708899485170540833634b8"; + sha512 = "a4d5960e0b60cf03c0ecf7f0d2b697dbb68dbfb4e0f3c77548c020d574f60c0fe7cc032a81215f34108a11651800deb1b1533efad3e238fd32780f22bd5524fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/te/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/te/firefox-61.0.2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "6d6ee190eef46bcf6894a429a589fdf0c336eba5e3b96f28f46d6359562e4c88cbdcb18cfa0053fc5f10e4e7e310e9d7aa3a7ea32d3d6772670221d5e9b28272"; + sha512 = "8bf1510077ce86f50c668cb8d931d6d0899d1b7559736312c86acfdc3149da75f8c8f750393e02023a9b063c27c03adcc6bd5c29c950fc0a6055392a2e0eb2d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/th/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/th/firefox-61.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "44fcee59ff292ae1015cf305440ec2f7d8fcf7888705732927311bea40d4bd140a6e74f0e0bba3788b3f9ea62f18d3fe2c23e12ddf78eda7df57da914d53dc29"; + sha512 = "af32b002380fee3b147b2cc44831c3d2ee29d784b8c935fe1be464b302992aebba73a39929ca23b35b9b6a8475e909a73622f70810e0a4a21bc7db74a8b4da46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/tr/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/tr/firefox-61.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "a398769dd7950dabb84638e216b1cce7be94693c29bf2989ed313ca7470f7c5bfd471a3663b08dd0c16b3ac28d5e0b1b42b30b05ab812d16914939bb1ece0b2f"; + sha512 = "4216a4e126a41f26b344804e4222535aee43c9f52fafbb6e1d019cc743fe18c0cdeed7fc04dd06fb921efc0431256ed2f09ed21fafff8a1132d097082b849388"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/uk/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/uk/firefox-61.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "fa3301461971158c7dc6ea683b3ba130be99674762dff62cedc5120d8473cf66ddb08579b3a911946a62ff9d575e6baabb5beae7c458af8a5b5a1028c4abeee3"; + sha512 = "dfe75bb618097d0a96066dd65ba0da7e9d3ce91c14075023c48aedfb88c6d30b83c8ab503666c7581783baf347beac58e81d49e7f9b671bedcdb6827f0843b35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ur/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ur/firefox-61.0.2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "a8d587b5808ca09907e2d788bf5d85df12663d30dc6d28b0c589c98b4e973eafb5a34e0fa69c5cefec992a50249e1c846f1d858e089f5264e6db14c261b6dcf0"; + sha512 = "0a1a8cae5f364b5e0e2570ef6e06870efd136322082e2fb7690b381f05195eee48787ac679916cd7508f9f51458c038798c9e73f982992dd5b0de8d596e83ca4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/uz/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/uz/firefox-61.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "b502728c13ac63f4017f2ddf655bb894f9486c8538c75cb4e68de06ff2fa93a2ce0a9f3e36180a28aaa0fe4c23d35a5d734ab26110a1631d8bc5aea00f7eaa14"; + sha512 = "153e781c6e4a530fad7631168afaaed74b0c8323317b1b4104cfffd8ee9250ae9af0ed9a0a0f157fc6745dfef7889402426c3d5e13d0c1b234fdaf952c9cb3aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/vi/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/vi/firefox-61.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "22e87ab09fd252886bf0040b43cd18e8d17666efe86da5fa3d6c981f3d85c1eaecf323a27157599d335ab8d09fdd8afd0a34ba7d2daa6069ef54b778074a98e4"; + sha512 = "1cc2e611316137b1d569d3c2617d41bddc48a8618a8937eab643ebdf94727139743b8bc6e1d18a7487e9d30f867ae1b7f77bfd528e0b535d122a4e8f9fcd311c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/xh/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/xh/firefox-61.0.2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "eb941a2457336c1057103736501d6a0eef688750e7a3ecf672bdc7957fc10ac0e681cbb43d6d88e9025182df1c18bdc2e6ed42332359ad464756f46e69240d75"; + sha512 = "b0c4a093950fe90ad2249a5259843e7b3b4bdf2179b0c7ee61e1f965a4104636a53d7db0b91aaff3047cc7252855970f12e1b3bc4aa9e4f85d301652cb53c6c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/zh-CN/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/zh-CN/firefox-61.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "ef196dc65cf7d93986d332795f5bee25b8bfb7322d8def53921bc3456c28ddfe555ad9a15fc7805662564d43f17391482442344502ee71cb30a77add41ef5a11"; + sha512 = "b3d1ea1e74ce5c7779bd1c7299197d0143688cc6bd9c4ae0b391e3849fec40c3142a9b7db19d3805616fa885deb16a6fdbe2fd23ddf0eac0fb0094498917d356"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/zh-TW/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/zh-TW/firefox-61.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "7bdebc9f67bf6ed0f5b19d95abb2b3550ff5d8da4d9da3f7764340ded15fb16bccf910bdc56c250db789bed735bada5ac8f4a5f5353174d94dabf984e03f7c23"; + sha512 = "cda9d835f282746cb711054f1ed2f137e0f7e89c27429af12f470ed8984ea0c9a4f28e5cd403aa2f37fe0c06271c7651f794009ec11ddc64a96c4c661ca9ecb6"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 1e257dd2c4869..984d80167c39f 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -20,10 +20,10 @@ rec { firefox = common rec { pname = "firefox"; - version = "61.0.1"; + version = "61.0.2"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "0alkiz89c42y6677n7csk694g9qsfzm8x928i6007mcdyh8ifkg1604pxwp6irid0w3v8cz7b2153jkk4f0qdx85a2r9csh8hbar583"; + sha512 = "3zzcxqjpsn2m5z4l66rxrq7yf58aii370jj8pcl50smcd55sfsyknnc20agbppsw4k4pnwycfn57im33swwkjzg0hk0h2ng4rvi42x2"; }; patches = nixpkgsPatches ++ [ @@ -37,6 +37,7 @@ rec { homepage = http://www.mozilla.com/en-US/firefox/; maintainers = with lib.maintainers; [ eelco ]; platforms = lib.platforms.unix; + license = lib.licenses.mpl20; }; updateScript = callPackage ./update.nix { attrPath = "firefox-unwrapped"; @@ -138,6 +139,7 @@ rec { ''; homepage = https://www.torproject.org/projects/torbrowser.html; platforms = lib.platforms.linux; + license = lib.licenses.bsd3; }; }; diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index c71ccdf8a0d20..d1561a0652698 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -76,5 +76,6 @@ stdenv.mkDerivation rec { description = "A text-mode web browser"; maintainers = [ maintainers.cstrahan ]; platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix index f831ac0847ce7..bcabdf43cd228 100644 --- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix +++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix @@ -55,6 +55,7 @@ stdenv.mkDerivation rec { description = "VOIP/Videoconferencing app with full SIP and H.323 support"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; + license = licenses.gpl2Plus; }; passthru = { diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 929277996c5e0..cf9558b4b955d 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -98,5 +98,6 @@ stdenv.mkDerivation rec { description = "Desktop client for the Matrix protocol"; maintainers = with maintainers; [ ekleog ]; platforms = platforms.all; + license = licenses.gpl3Plus; }; } diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index b6e9c9210251d..7c630e522afea 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -37,4 +37,8 @@ stdenv.mkDerivation { mkdir -p $out/share/applications ln -s ${desktopItem}/share/applications/* $out/share/applications ''; + + inherit (rambox-bare.meta // { + platforms = [ "i686-linux" "x86_64-linux" ]; + }); } diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index c8b4c951abaf4..00e94234405cb 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -55,11 +55,11 @@ let in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.15.3"; + version = "1.15.4"; src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "009bcy90dvwiizya387fqrh3a8l0czgs4wnddxndy9gd477sn704"; + sha256 = "02k64hnfzq8d5g805n4bjm2x8xazskp8fwbmcbl2s2rshdwil1jz"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index b5bab3585c5f5..ff80df6523cb5 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { description = "A terminal based IRC client"; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ lovek323 ]; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix index e7e199155d731..3376eebe5dc93 100644 --- a/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix @@ -81,8 +81,6 @@ stdenv.mkDerivation rec { ]; - buildInputs = [ gnome2.gnome-keyring ]; - nativeBuildInputs = [ makeWrapper ]; buildCommand = '' diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 047b1659642b2..5097215d43666 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,595 +1,585 @@ { - version = "52.9.1"; + version = "60.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/ar/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ar/thunderbird-60.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "9384c43cbac7d6b88fa160e22fb21e6f4250276b46d3fc0322dca45a6b5ebacfc39a431b54d34262a32f2a7cc9130b68b6dc4b636a737ecb7132e077592882a5"; + sha512 = "fd37e00c8b50d1dc932295288ad2865358da2f37f5b170a3a7f75d929e78486165a24f1967defcb4032546a7f712cd6887c7cf47257a4a08685df85f9ecf81bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/ast/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ast/thunderbird-60.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "b1d0b26dc21c4487f016c60aa8560ff34c868c6e617040f963ff9e76b859d7d265cf529c0d70fcb736aa946ad50b1a0cae0dd66df1594e102a85cfa489b07358"; + sha512 = "64a14f40678a64def00597eb1bd7cc0c9759b56da4e72bfe24c3d4e50ef92414bb18346b8ecc9c0a834a063a2a2fe7920b72c2ce59c7cb7ba67442f7e8842b13"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/be/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/be/thunderbird-60.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "635ad3d57463eb51830dfb66871258b69bcfcd9ed0c2b38956a25db242905113a6604812a6d6aa1778dde1783595e2b4cb6b3a51f48af6f6740e6613ba78adf7"; + sha512 = "6368f3693f0f54f4768d27a4b9f82015d4c789180db3d8ea5302053e2ff8d7bc5e50388b00b7b1d534c0145718255c84d43977361f5d8cff5f432a8336436e9c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/bg/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/bg/thunderbird-60.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "573f0b63a16f62662958ff1884a2cf76436242f377258f39ea254732aaa4d1f358ee651b2e4f5eb2cd3c20f69ad6b6ea2bc6985fc3d99e23edeb75d3ca55ba27"; + sha512 = "b881105b39f5a3d66cf77105fb555af692477b387a4fe2c13c9c398968baa705cdf3753665b0e6d28bd8fdb21bc75e439672402dbe1185a9f8289b8236f505ef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/bn-BD/thunderbird-52.9.1.tar.bz2"; - locale = "bn-BD"; - arch = "linux-x86_64"; - sha512 = "d277706e699ebdbcc4ccbf8f6d5c4c256b0ed65ad7b604962e8cc2dffa5b06eeffad7dfd5dc5a08b87a25f0e728daa79d2e0ca0ab9ade7136057a3aef203f26f"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/br/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/br/thunderbird-60.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "11e362e77f4b5ce75823c3aa60fab68969d8b19b6fb9a51027c81ad4e1e4f46c4a5a4e3218361521d076859453523a30cf79ec715abfc59cca31c541f02562ef"; + sha512 = "c45a3dfb8ae5564071c2e59a623263f995a83f9ac20c84345be47935a337b863be3d334b2e0f40767842e9a53cbb1eb00dd87645cb0b8a737efce15cd81b9336"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/ca/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ca/thunderbird-60.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "7eba10d82c0b2bd58d87670c345ac8948c06f1b6a0ac853d40b1993fc101931dc581b3e252ebe0a22948f18738d60714aeabebc8dc1953f0199ccb6b2fa1af47"; + sha512 = "aec05cd7e9a5f529408bca9691ef68bb384b23b9cd464c9342336b96da0afe20473121128861c20d55bc3c4f5c33f779fe892681270d5b26df6b64aa27c13511"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/cs/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/cs/thunderbird-60.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "2c05465bc32b6703ee930ccc17b7bebeba3e0eda37b959f08812d3a891fe17664862b7e981a37e43e0adf775d7cb929d866ebdbc044ff53ecf6b1066fcc2796b"; + sha512 = "e0286e388a1b9a273043bfbcfd2bdf9675bede43d6b3f364882a9f7a9bee1fccd76e5ada76aae309f961c3e0bcae6373cb40457a53d48a9ff37c9fb53245f889"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/cy/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/cy/thunderbird-60.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "0cb9735931a29e098e707d27f22f412ba0d0d242799a10658b4ba41abc3ffae5fc2028f4efaf82ef1544f7ddc8efd8401b076945f8b5669231af62fb00cb2019"; + sha512 = "7f5f28836084132f044b3fcda749dec03fa6234a04eff73a8001f804c98be8df57eba564e864bf09a9938818bb86003d9fcf54cacba2d1efad7a330381e08b0a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/da/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/da/thunderbird-60.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "906ae74d45a9915e76fb666a89b00c5378aa9498f29025088eddd3853a93b79ba0eab2d5678908e10f11fc5273dc15ebeee6714a02a70df6ab7bdc0fb7df4917"; + sha512 = "1b9b63abe185fc91ee2e0dea054bc5e94941bc2cdd59cd85c9997ef9d49eed0c93827265847a480845901af8b37e3547c9301896beb538aef724945bca2ed2b9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/de/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/de/thunderbird-60.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "729a833d64df3d1270b07ba2bfdd963efaee4d0bba98d23d4b07f9924878806f59b916af117dd5b866fecba6715bf10b9586e2a34b6de66fce803a76eda07232"; + sha512 = "e499f327ed9f4536b7bd9659879b28a2282a6a2b9aeb4514b3a70f774d76427283379293d09e95271e54f7c68ab07beaa60e867936b9de8c09b600914d3e4156"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/dsb/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/dsb/thunderbird-60.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "420a61731fb8159104a14b9741166f250d689ca18f15ffb1e408366fd976e723a72b94cc5ed512895e1e0fc58cfcba2dd39c7c898a38cf996fd59a1de7967fd1"; + sha512 = "d862020f5ae7c50560ba4c58d67af4c0e54622f826934b90887efcff5ae1c97126bbce0bd42f7e1c1215258b92db6a012b184a2106f4beed0d7e8c79b84bae54"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/el/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/el/thunderbird-60.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "7a7cccdf48c9fae667ea33294dbabfd2217cdcf6922a847dd93db3567e9d9d527015124d777e94db5a7c32a9d9f31ecc272978972dd07ada60c8bd3e323b1d12"; + sha512 = "88b98d3558400370b48f1e133147b8ba57fbb240ad6db1bbd79d7e0266c4a2814fc9cad5521ea8c0296b14857bd09cb4e8e0d86f625fc53d621008729f31e002"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/en-GB/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/en-GB/thunderbird-60.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "a713653bc7da8347d2897ff522c8cb13983fd913ec987a81b9bcb1242dac14c0cd875e7bb5dfda14938953af0a526d24a54d40e1b88e31107498baf00aaeb6c9"; + sha512 = "02f1eecc4aff0a8691cdf131736c34fa93035d821a645c97213be41a95b4ff00d244411344089e56c24267984bc91d294f1250b1fd7e8c966ee9de9983794427"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/en-US/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/en-US/thunderbird-60.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "98a35a81f77b58e6f5fca79ee5a56330f8184072c118b571245c7f686d2a196e0cca6f4df131bee066651fcf69b83ca076bb9dd68fa71dd766962694df8e43a7"; + sha512 = "87be28d46f22885c730e89c0a945ed307b23da11e331a5911b21353a53536587f8e95658de591d44a9bdf617dc3d50099f537bebe85680dbf1b3f25c7f18fdfb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/es-AR/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/es-AR/thunderbird-60.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "fde54338bcc99c98f9e8e77f30795252459f79037ed996f3bb055e3c650104a3f73878f72bf02c0a0db4d907322f896600e6f057c4a39888708183489f80f579"; + sha512 = "4d1651de4d4b3d5324ae5b07581634fc82399a2b0f9793d53797224d2f6b1205389bd0672b1c671fb956191312549b446c317ff98f187e1a7248aba901bd2499"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/es-ES/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/es-ES/thunderbird-60.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "08eb3b2c6422429e19e909dec8d7cc0cc2288e7b991e466f32618d2018ab4b9dbd8be78f469315645b5efe866f7014dadd3d5a6e997f6540422d6d8de61bbc39"; + sha512 = "6abc82968464377cb2c05bc09b1bc978af65d9423dcba78e73e8d0817a2dcc1dde89711acb1d5fd9e3539cd33c6e3813e6b00297f3a23ff1c4250771b40c8522"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/et/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/et/thunderbird-60.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "0a1e8496e256990715c11eadd7d1804336542215e4ac34615145fca02a30ca97f2f92220631bbb0f55cfd1579442064d1c0112665bd6e3a35719faefcdf13ea4"; + sha512 = "9e4bba499f39ee7a87676627fe3ec6da2dcba6a55e39aec897953abf00ad08216550d0fe94804a5426e2894970ad2db3f391dd09ae2768580ea05ac6a77ddbb1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/eu/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/eu/thunderbird-60.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "8696ed02d5bcfeb12ad1057c6a5e2558f3261189d7147bfa86e1043f13da58d60ae5b48a31f2113e1b699f049c9f06a946998cba766bb5faed9b1ba612ed2ec4"; + sha512 = "66aaf66011117c2f9e675f22a68317552ed7673c05dd56266e4a8719e853629648de3d88fd44448ac1d9674b0cdf6cbe48925328f633c1bc23cb5a7f005468ac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/fi/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/fi/thunderbird-60.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "e60015623faff6c065ff719fbbdcaf81c48f5d9175a61c8a4920e27a51d8495db782b6916ba320717d36807f758bf5826f2f882cacfc25ba0bbb4fe1bddbce6c"; + sha512 = "8c61206e100182080859c45736d973975ae5e1055fc2df170828dc0715e04be5468ba815995be9d60530ba9600e187aed965a1d94f9887337789c8219e2cca6b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/fr/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/fr/thunderbird-60.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "e5a276e8f53387f8acd939fbe158d594c7b5d9ebcd6f0a2ea92fede421d1584ef42e49bfcf84efe651d62ca60c311634e9fc4ee429fb38c70f82cfd0e3823fd7"; + sha512 = "1583081060580dc72d864ca88ae8f114a22db4d4f3177532a4345471bac6ca3a85397b5bd82cc32f85dbfdc4992f788dd15a4dfa9d6fa7b154d3921c0c23fa29"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/fy-NL/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/fy-NL/thunderbird-60.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "1f98eec3b67b2aabde704fb14603df6258c0f996868c57490194b1e672b52b59026a17e2b7e35033b71d95f3d46968ad1eb7e46f35f9799af49781d7746d8b20"; + sha512 = "59deb0b3e32dc2dbcce96aed6558dee899e290a469ded997bd2b7b6b2832f5f7c358d44f128cc1fac2327e3c19c43400424dccf4a0478bcbfeae3401fbc93882"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/ga-IE/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ga-IE/thunderbird-60.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "54c8c9484400749efb129630ab6a107da6ce1a77c8e8c43185fb84f98b13c33edfe512c63d571a5206c3600729eb644a8e8a0c325932d81579c8e8932a51abab"; + sha512 = "8bba0addc0d9d1000ddaed0702b5db0d797f3ac9fff0f04e645d6fb3747f961c2570ee058e53d4084e3c02cbb8490c2a32781517c57bf7971b8f1d4db0fe871d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/gd/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/gd/thunderbird-60.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "4cd2140b0871ee144ba5996c98a67fc6b8c6f0beecc15a628968716d472e4b93286ad606e9b5a54b294329f83dec85f48f5008c30e1970ec2feb40f0bb0eed98"; + sha512 = "8e8f5df3aee5f1dbc1e6fd8c761b5d968dd35b9e29a8c04e013a7de08091f65cc2573109f0bfe201048f90a578ea84f1bb05826d7bd8e9fb7dd9110b45623034"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/gl/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/gl/thunderbird-60.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "e87fab8d479c847ec7110926ee7ac93668495caddc77bc8a4a3e382ee1aa12488221b6facabbbf74c0aeecdc226705d9cf4edd649a7b3a6410fa98c62ab37fc9"; + sha512 = "56a56179eddff5da07ce124f17ed08a6a033d7c2c3d139fd5b00afdb86f0c54215525c40f9c6c108384adeafdcc6f8dab87d72b07d88bd38e0c43c89aac4db0a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/he/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/he/thunderbird-60.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "26766b3b37c3b13173cb06865185fa08d4e8a1c07c3f8ce958545b21b3ffe473885c6559a6799fc82c426702f1433d783b55c821cb1e30480456dc9352c9f3ef"; + sha512 = "6880b7ab22b3e642d10edce67458fe30935c87dad60f32ac32b443473e5a208a4df0645b2a18ef26d5ce40053b3a9119eb432e640afca8421c4e93815b28bdf9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/hr/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/hr/thunderbird-60.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "458500d47e73ccc2d8a370ea63826224cb1a8514a322a9c8b98aff16363e3807a1d4e4e0b007b3eccb8888def285831d1afdfd9004dcbf729779137b28bd9333"; + sha512 = "14b22f95559f1c9addf04d51dcf857c3cd59f3612743970bf9cbfc99c84a3d0fcb898be7e83858c0848e341039493a5aba4189d24941362327f4ef9982dd739e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/hsb/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/hsb/thunderbird-60.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "a612cf7e309437abd521b0964d254c3c980ad096f339da0db803d6bb739d9761796af2460ff989355102b628b4d383db412556dcf897c351ada417089703f2dd"; + sha512 = "5bbddd6bb288cc03015707bd2ed3ef38ff20c7b93b08907e1b90cd8a22725786a293fedb142f99e18e0cf66fa14529097399e95fd157c434414c8fd61c0ba70b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/hu/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/hu/thunderbird-60.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "49790909eb91f8862807fbd213974b906d4ca979646c11c7377c205cd6a7092ad9942900729ee90927261ff969a71773941b29a8be19dd4d8d7a325559f81500"; + sha512 = "4f751f64b1417022f6c1487e1f3d92edc0ea1cd603850a9f64b35a71a652be1e51dfa17babb66e3447bc5a8bb2693c6e2dae89a736dc2f070b4b6a9500cf9299"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/hy-AM/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/hy-AM/thunderbird-60.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "57285eb8916dfd90bb4bae2d791695f3bf2c2c82742f9040d20d8c0f6194adc493f36733a6a2b9d474c036ac25309330f96de17e49938a5f97ea9c369a02daed"; + sha512 = "c932b56abf6801bfb6ff90978343aea12f67f006ea71882fa7bbb469dd750371330c47581f48aec3ecfca9cfa51f7edfb2aed6a3da874041c2087b5c5ff60abc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/id/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/id/thunderbird-60.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "61313d060dc24b1e685aa434c6beefdd6b114a2ca24f19690e1cc712db75d238610c3a23ffddaa373bcbfd080e0bd53c8e3d05243c7d184535bbf95b5d0df00c"; + sha512 = "d8a61bb0c1c308d7ef89a9f938fd1c738ce8e66cebfdf4a236636e3c9469705c1012d19c3d3cf8837bdabefed01c744692aec2d749c7ec0adb472bc125e54cdf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/is/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/is/thunderbird-60.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "28968973b8379c91dcb1e6c27127ab55a8044edd0c518defc9c2977ac728928bfd1c75e2e357e3faf71acc3b4bad6e90a1f588742cdb0abf9ace85cd424c288b"; + sha512 = "1fe98420d0ceda881b50e4dfff667de59b960c1d8a23b5f88140c076fa5bfc8cc01b636a3b9bd46987f87a30ba6cb510eeaeadbf83ada954a5681c3da68cf7a5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/it/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/it/thunderbird-60.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "3231f2639940323db9a23c236be5ef8304ce953821971801bbea2d8674c2b54d1ead79041992d17609c6d1a9e86e352af84d76137a7728eb085aa54da0c02d38"; + sha512 = "79190716416c48bfaf486470a5f31ef881bce0b97e4c780126581a38ff39e6a14ae12487779ed219e55afa2467139b652f54e989b91f4d438685d1fb174f920d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/ja/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ja/thunderbird-60.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "542aadd1a658f9e21fdf0bfa32069e5adfba58750fda943389ce4e3230cf063503c78353e739fb6771434b209b6c836f87c94f7831d50f2b41c8dd38dc6da198"; + sha512 = "c8c9d6a31664df4e7ad9668a73197da100f5c0b9bcd7bc500638f1d1c26e123a91cd370cd574185f0a2700c44564df7a048b6942265294c2326c8d0ae02f8c73"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/kab/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/kab/thunderbird-60.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "f97fb7db2e055ccad2310d813a15086494d0815fc3cc48d49928c5642175f9db80b4deec8c4a4f5568417a26e898348ad10ec887b8a8be161586ff3c53ee3ff2"; + sha512 = "d76f7178edaee6d16045e332ecac4dd31d7eaa3e8688c24cc48cde48df7df9b1bf9bbc0d76a95e8c35923fe1fb743792bcadf8d3f705f76a8acc7d714b8b0bad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/ko/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/kk/thunderbird-60.0.tar.bz2"; + locale = "kk"; + arch = "linux-x86_64"; + sha512 = "f3d13ee3665e6345ea8295d616d227ade4be5af166af08b0a2094ae27a69eb82955933967f734e111930d802270f8c5ace57a9f16bc56b920ad9a3081f82acbb"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ko/thunderbird-60.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "1854d0c0365bca930a4480226dd54bee3e6798857e68cea3dfdce94247f298be6933f2ed8a7abd89e87ae063a7a14c9d7ad1998abb0fd07dfe9a2a0b2e63dd71"; + sha512 = "9ff20db6d945938868b5b9833519a93011d33804f5514f0f347814137f9f8e96b427658f1f086867c0b272ef8fa5c22e92b8093950b534f3ac0224f84bbf2779"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/lt/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/lt/thunderbird-60.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "2979f9059f6dae5abd9ead9bc87052e7a4116d0f0001a3585b70e2a0609c85c1e6a38d547a8a187f9057d68f7a87a4875cc209f00a1dd1011ec7634cf0339aa0"; + sha512 = "cc0309a724a2b21bd6426af53e5ca6b8168f2e3f1293c16aba954c1484defd0a227a1d93c4d92e946d5327d5ce58fcc37f6848d180426e3cd9673de483676713"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ms/thunderbird-60.0.tar.bz2"; + locale = "ms"; + arch = "linux-x86_64"; + sha512 = "59351da7225877be43a1e651afd089facd47675497d8f2c0d6bc1c8a2234058ef9362b30309d65b074c8b98faf19b9d4cf80e83cfec2f8e438fc0a7c6d60f899"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/nb-NO/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/nb-NO/thunderbird-60.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "e9a61cf7cecf7026bd4aa7574ece60e9738f710a43733d7347a1ebdc460322b975ab86be81919a85faa01f728aab754825062da5642231658daa1a318e919c3b"; + sha512 = "94c5f139cda0a90bc575f32f6121441dd198455482a89d052227777759f912f26aa53d74a6232e3a78ecf1cd3062cadfb3c7f30e349dd59bb8797825dce825a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/nl/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/nl/thunderbird-60.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "07c3db2e75395059f735a17bd4db3a68ee7fa97fbad3dfafb0aa1371d360a8fd5b693bd6034afde2457e7e13fa6968d78df0f297c55fb8882e10f4311eb03244"; + sha512 = "f1fd359ab66f349643191efc5f112a4512acfb64cf088b963068e54688c34b4244a8b0d31135200a706122ed797e2d2b09237e96c1076bbf086d660b80d44dbb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/nn-NO/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/nn-NO/thunderbird-60.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "1eaad3950f23e1e7a83bea070a8d5c4207b5c2443af11623872a446ab45ee8e2746be9de638828f951a47dd8966426a1d166eb98dc900de39d0a230d438bdd10"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/pa-IN/thunderbird-52.9.1.tar.bz2"; - locale = "pa-IN"; - arch = "linux-x86_64"; - sha512 = "da0b4fca7428104c75650435efa2ab65edc6ca4518ed4b6274195465cbea5d5cf9bbb7f3aa22209f298afab970556f51638bc752ea50edf2a3fd7b562314af61"; + sha512 = "819c02852685cdebf0b3c3b86ab4261ac13ae6067f0a9c3610214d4cab05f3a913da58527be7d3fd2d06fbe9de13481c34c679b317fe0659383b31ac1fd19bec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/pl/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/pl/thunderbird-60.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "41c14a41b00b0a92ee8bce565ba2fe9a4ca1461ce5a1f54dbb40558bc2d871d07ee5edfbc6c8df1a7aba7e1a957cd11acd509e193b657473b14b745bbf06e3e1"; + sha512 = "e384e19a68ab56c16266d59abb6b22ad5b7bfef649c2a7537a5822753f856a6e90604e057a7a43b744487294475be6afca2b8484911044422fbf06d01df31e5c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/pt-BR/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/pt-BR/thunderbird-60.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "146dcbef8d811cb1c295cc72349f10c8f345bd9b7c95a1347b68681cb5edd02d129f583338c0bf619b37df357fc000212894a6d28a3e833b0626bd1a62b02b3c"; + sha512 = "edf352970e3292c9f3eb17caf8de07edb924d14500c3dfc6d1864adebcfc174d1639b2d0ca5b4006cd952f9922e09fd220ef50c7ee3f15920d554dbae22eaff4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/pt-PT/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/pt-PT/thunderbird-60.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "aa60bb80a1a4df1800037a6dbde7f8deef9c4f7f1bc3926bbc5f223d4436caa62d5e9ded7eac0d91f766b35d6ae9a40fd2aabcc603e5d2276f1bf598b715b56c"; + sha512 = "2d91620bce2051d6c30a3b16f21f7c97b99e3ac4a239e22b582b37ce7e6ef4b6861d66e56e7e7f58cd71cd25fcddb5e161e66248d87fc9984e755f229dbd54b1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/rm/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/rm/thunderbird-60.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "4e109d618b6c6d9d578b90012a142d8ed8e16a430412c95e0a2567dfe7407f828ea70cf9088a4f9d5d33fe294618f052870630ae521feb0c474e76e6946d1bc0"; + sha512 = "0ee05046cef873313eea34cb5bc002f9231f015415ba97c23b06e7ed0ef9996e7cb77beab89cc1e312fc74122cbac179af430153b2426d885acef8fb7d1126b1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/ro/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ro/thunderbird-60.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "0fbbf47332fccf2eea593f12751b5e1ec502dbfbae7e100d56906e2850191129f8fa5a51794f13f6225c2de6c219933e36074970b5b7698fcbcb58cab2abe6cf"; + sha512 = "c53a2bdfbda8cda335d2a9fe03476090034ebfdbd8a8eb345a9fa5d3c0f1422a0e1c2d95bb5a0b75cf84f8338679068436cc90c857a3547f297f3294d5028b70"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/ru/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ru/thunderbird-60.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "8d26c8c5248418cbf329c3ea6ff0fa60baf9b12110048327beb15073d2398aa7d31c97acc33d1b6bcc65e38b651d619f5a47007961ac1adb290783ad22c4be64"; + sha512 = "ffc6c2729291d8d1c7f32cca8933d3d8adbd54e278940ccd7cb844778b8a55123af0bcc9d435480077551de49d1c2200250209311579d2a34a5609a336eb32b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/si/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/si/thunderbird-60.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "17cfaacbafbaa98cf73f6df074c99c40faf6687576cd44315ce4360bb725d8ab0b2fcdbda08f160441449e779b3d769765063079b3fee8c0b4a366799f0c38c6"; + sha512 = "9f708d01d6a6492d10ff058bd2425172bb90ff9c2827cf88a4307de0df20c6cdac9d8c135daddbca132fc55e89c68924fddfe9ca8cb49d77ca6c874283c49a8d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/sk/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/sk/thunderbird-60.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "d22d8d46f3a3d3206368225b7691cf4c6fa235ec1d2e2476f46c1982d2fe071909d66cb180ef2fdb81ba494e25ce3d4d20a30fa579e27c2e2327b60b5c2f44a3"; + sha512 = "44e3dd85654dd91ac9b0bd1f1d7f6f74341e3f39be8f01b028353d3425938825877b8f8b0c296ebf269cc5b1e78dbdde18bc49153ada0065dbc1de3079096ad8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/sl/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/sl/thunderbird-60.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "00a89b3dfd33979d5a7c9f256b57add0d91504a00712effa8ed3a14dae80e92aead5bc5857507810b1b99a77cfea709e07454a3834193677fbefa68db46edd50"; + sha512 = "2d77bebf1e3a6466fdddf32f21cbb5d28e46f4b70fbd07eec701559a0accb6f78ed9ed8a3b969d0eb3e249907208ffe8ab096e6bb035bdfb8c91e268ba228992"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/sq/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/sq/thunderbird-60.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "3bf0024db0d43d26bec31eb40fd7a2fe42d105072663c21a5e7f8f38cd718a555d7796cbc2d28da426db01dcf003cb2c351237e67a0cc9b4b3f3cf7b6c37e522"; + sha512 = "f705fad8b3a3ec5f760f28205caeb19986cd90084c8db0d921569553aa3cef668443e30594a82a32cb684e4cb2444057d04355b39a2dc02ac2dfc0ad5273bd68"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/sr/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/sr/thunderbird-60.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "f3e6ba6a80976bcdd37539d78829bd16344069082dee68ada14ec1de611a3e65f132431c074107b43fe855e46f15504766c9dda536c7112de081d0c450d8fd04"; + sha512 = "37dd80ec39ea566e66d8ace889bdf0353ec63682356472a1d0352f556814bee38793a263b285c65e9a68e62b782caf064d7b530b503e1222a490ad81798b2a76"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/sv-SE/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/sv-SE/thunderbird-60.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "5eb1d2ce97320961c3d70403f8f81a36d0d686cec8cb518065d4ea950d7b2ae1588ef64a6b2276c6f8a0fc59136108a4fa50f44ed890742aea2fb77e14886b2c"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/ta-LK/thunderbird-52.9.1.tar.bz2"; - locale = "ta-LK"; - arch = "linux-x86_64"; - sha512 = "e59d4e4797aa96a8edfeac79bd9720f4a893c548b66efcef365a92cde1e1f9bbdd4c9046d7483a148e28f9377ca2eebda42683769fb4e02f4a56ce629596280e"; + sha512 = "3685b1788f7da31032b5b16a974af87d729a05aad8f906f6692d7dd688684c6f745fe766a1c5baaaaecac4d1b417d3e91d78ca082a41704a6f9caff29b64d842"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/tr/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/tr/thunderbird-60.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "ca29daa1d9f255e3a5748259fe632382937d51c593412e28cb6d99d7339cf5b9482ebcc0e76120d0988519538e10484187d13134c27335ea708a5a115b9bc2d1"; + sha512 = "3b1de9eb1371ac686c1d28253bab5b5a3c5ee3b91739bd9e272ed496266fbad01fafe5015f257cd0dc6ef553d47d674bf13e5a53444d030f50572c929d0b3c75"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/uk/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/uk/thunderbird-60.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "ff02ebaa4d8d9174387b7ad777e5372361567b077882a9cea84c30dc1e430e76f8cc07e14f7b32c8340c893e6aa395dbc249decd89f6facdb05ed9e2e14d34a2"; + sha512 = "0cbd6f8ad5f0bf49e62efeed2d52b3c22ec0dc4701d84771465f3650ca2ca2736acb1e9d83fead6ecba4dbbd64eb883bd9cce9ece31b5e1ec28da4a410db196c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/vi/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/vi/thunderbird-60.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "210b9f8f70ac499305e0bb66b9dfa294c4c0f6784520e8238874ea7ade9d6ef58760e3beaeb5f0ab14554fe34618cfbfb023ba5486c8ec12ba57f5e72d3fd069"; + sha512 = "0e0440d0640b7c50aea0a6a6983779524007897dee8996fbf898d110881920041c99891ba282cdd5bd02060d4f8606e57bf9ebd25531ef9cdb87659aa1150e55"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/zh-CN/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/zh-CN/thunderbird-60.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "bc41f53a3c37e2aa7f8d960aa7d2f7b90d25971ce34eb664476c92a4b7db3753c96f22f5b0157a1298ab2b65e03b85b8268ff5fb0fbbce7aa3364fb587a17549"; + sha512 = "3fd66874bbb9853da447cd4a4495f848d1ead3a1ef1ceca36590082f4ccec8985280d25f42a643b52f955290a4b9649709909080db8b6a592a943ee1ba4bbb44"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/zh-TW/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/zh-TW/thunderbird-60.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "b400036ddd90488b7cf67e98b2530e4d4594637f9259f20a92a7a3c62b2f7a60ce390b9907a1b2efa44af29941938faed4e10ff6bda0c67656b8907638578712"; + sha512 = "8e716f938a146a14c9f5ad8d99da463a6b5ea8d1705c26a575a4e34de89e1e9a36e1a288f60bd67b87a2560fae7646dd9157c4d60e9a35f7e977d20d55756f0c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/ar/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ar/thunderbird-60.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "1c8f71b60a0b5088d3d8b4576e02727a939a60b821aeb3015f9aa5b65231ca93b14894fb506fe2acbf579ad4686e83cf1e0d3179575a0510d571de146c4bb7f8"; + sha512 = "2076cd84255a8ad52521a752b8444cafd3490932b69a3ec632d8815a5215d08d4efcbebb888f76b26232eb6edd66c4b9ce2233107de32603d6a7a37b87f3595e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/ast/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ast/thunderbird-60.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "3d78cdd28deda66fd42a2981d66c765f6ff4af8a37d166712094a7959541ac6f42fabd240307d2189d7bbe24c2d850bb99d7fbca5ccc9820ef68210c3dead49c"; + sha512 = "a070d8bf3771ae9a9e09f40888b3c7cf391eef4966bbf437f547eb8a914290d2da918e7a824558aa5a506ce1941fc95ad738bb9ba56cc7418004da6658c42344"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/be/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/be/thunderbird-60.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "d08e59550f24a1303c7591fd0b8028c49613b3f0fbfc9adbdf0100955e35fb2569b5159df7847cc514249b25eaf5fce71e7902fb1c13824a9eabe650fa438e5e"; + sha512 = "f9c92aec1316decc523e8bb9136004ef74e184f2213c1ae92541416c36c9f3aa1a8adbe9f875b25120597026dd948a1ca68a9e1074643088d2698f8483a04762"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/bg/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/bg/thunderbird-60.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "c78340650a7f19d14335cd35cc80938f0e5fbfc94063d600d7dd441b925dc2b6270e85369ac293f0addbbe74e10802dbc69bb76e0cec2a6af8648a5ca0481322"; + sha512 = "a576991acf9129ab9a365e80b90fca7aef01e66ce3d06dffb8ecdc0ae3d8dc2902470a99a0293a87c9f112fd13658b71a86e6fb045fa7cefb7773de1cdbbe31c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/bn-BD/thunderbird-52.9.1.tar.bz2"; - locale = "bn-BD"; - arch = "linux-i686"; - sha512 = "5909ede1236341f07d00d3dba5d3297b7bc24cb9c08d133851fe5e412638a3b9e00291dc40fd927b73095dcc9a239441b3c71ec7a5ab3210fecbd4e4a5a229dc"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/br/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/br/thunderbird-60.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "9682db4630a840c676c0b68f010da21a65ae9f81c4373def81effe08c9c2b8759626d54e8923e6bb1381453acbac8942c4ab07f2491d3d3027e91c8fe9275f2d"; + sha512 = "d63edb38305e2ee76df5c05dda275ee45ba419bfc6776d007fa39dec36d202158f7eacff9611aee44d3681b0db5b200a6706e8034fffcf1ca7d575787240a5ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/ca/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ca/thunderbird-60.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "3937ecef0ad33e43bc8822bb22f8c3398d51b37278c195dd9b4f4ed9c5d49e53cfb79c9a0b1c684a72735d44dd7865097b716268e7d6280b70e46b219b87302e"; + sha512 = "d5ae9f8478c638fb50af671dbd12e95b338333e87b31a7cd42d99e8deb200ec23841ac9b93b0ab26b39306067203d8645976cb99292e3a028149ca549c9d43c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/cs/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/cs/thunderbird-60.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "88f958ef60ac5b73fd29ccd40d9e2794dc8d57df2c15f426aa32a5d605d6b4702e2350003b394d19ad13fe3215552070947ff0ab2851698162946221b3ff1a88"; + sha512 = "9284fd6b7757c4ba331f2d2e713c247f7fbdecb7724c1d66df1d1f0c81e3803dea4cee6fc4a905020b00ec5b281a4c959eb56ef401af5b8ec5cbf05252d7ab66"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/cy/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/cy/thunderbird-60.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "0301925a7378a706ad12225aad4d10ff15962426c02a294b1e9ea9e1f779c429bd2994c964d4f05048b371b71f0c6c0ab1b37204b242990b931a3a774a05b04f"; + sha512 = "182e1c8878e53af87b5b83fe00ba5a8fa7c72ee35002e843d3e1cbbcebb1d2e82c37e90a44c411b238b9c843be6594aa75d34deaa576d213c23af4e2e8b0fe23"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/da/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/da/thunderbird-60.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "960996c312b862bab9447985e1cc9b1f09a61989e538ac3eac2a95b06496102b5387cfe1e762128f1b521844f4515335f4ad4bd9078771f9c2245159eb39a8ae"; + sha512 = "10f22a40283a4202c0e6612a27022ffdd3d2c45727cd170ebeaab6678f59f624c6d2520ddf2c9540e98030c6813760b5d56c70882caada0166985f3206fef4c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/de/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/de/thunderbird-60.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "3ab75cb50218db215a1c7d4c39b6038ea3dd52ebe17b5d3fb0cafc74a02dba143d6e4c0efab7c6c1c494ee83297878d82355bd4639f6aa1625be3af5f0b514a4"; + sha512 = "42709aa4778e93ebd61ff44d027eb0445028f036c735943d71ad355870d03da6dabb763367123156922aa56fe66d6968ba9c93e7b9a8b58197624f984c36437b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/dsb/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/dsb/thunderbird-60.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "157b25d20020c4159708790e50b09eac2b814a817655540abf878910b53ac2c1040790e8aa115bccd54797a5068954b08daa5c28f70c7ac161eb2be78f82cedc"; + sha512 = "6b82976526b862c9cae1a056b04f36c6d6cbc4ca91308a1f02a808d88272326c10f34cc77aef00b6f6c1863de42ed9a03328a667e4a0b985ecf837765557f982"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/el/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/el/thunderbird-60.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "52c0be75e9979a08f1335da437cb47fc17cd928fbea5af85283b5d07f07fdb4ac6e2f924d53f7db9e31cc0b9e7659f48f8d6e06a28d609760a0f8e6641bc96e8"; + sha512 = "4314dc7d8fcffa4c4f498d41657332bc476d79f934b4f46181fac4b6cd93d3161271fcd0575f07139186d502c5b833b53ff26d2f8728c9a73765e551963c45d6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/en-GB/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/en-GB/thunderbird-60.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "53e66c5e9c98a6af311732341073b553c577dcfe35178996c7a27ee0cc0dddfc7774a065fdebbfa0a4cd4f6f3f422e9fe67fac07a586342e9dde33b59d6bd17a"; + sha512 = "0840f23683c8c109ac802415b4216f778d6e1c2487e0e8d179def2a3b56308a7d9888c46a96d8d509f99fa4aa296213e2772bf1e74a97330c5e2bea97dce7c70"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/en-US/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/en-US/thunderbird-60.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "69121dd8b2445e6304f4437c06e1b7f423b19d4069290c0709a3356680613964df138c417c3d258bc978d8709b9ada28548b43c93ea9122b64daa046d96a6d78"; + sha512 = "baf0334ba9803cdb79e1a05a6745f6a87575d52bf86f6169b664903608236eda8ba8965481a58b660fb1edb567c681211f328c3f0b9b298e267b5e572b41f642"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/es-AR/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/es-AR/thunderbird-60.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "e557b6249af266de41863b49a811f4c5c979e88dc15ccce6fe60694b98dfd9f09d8ae7316652626c19e5379f20b27e58f4f1be465f4df896a3aab693cb0ef5b9"; + sha512 = "c7a7ba5a547cbb7b839191b14a0a78835935cf589f82d3ee28e144032e0d94d9209348a45502b7e2da67314427b23d88fabf61db1ea78e55dda9bd1ef97abe9f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/es-ES/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/es-ES/thunderbird-60.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "779d6a4a793f4bca441f8ed8ffbeabf20a7ba8555b0fa36229814db68f98d35dd15855446c7dfb8aa9509b40dd5cbabbb0ad66a604d6205daa9fdb4b1a4b9295"; + sha512 = "ae3c7211dea682e133f960a147169e0a7b615a0fd4ad2fd28fed3976a395f16ebbe1184c872746e2872a09466ca84646cfdddd270ecb3567725dab24201297d9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/et/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/et/thunderbird-60.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "7da30d3e48b520c74562d11719d1988ad94cbdf676f244ffd9527475f696b54f50a1e14905a045b7d5375e1b99ba3d0459acac1e72d22ada24b0e91e74e7c2cc"; + sha512 = "e08db3e430bc90b5af7fa5d979d694d38de1bcfbb89d68613f5b3abc2abe135ca19071890fcaa5e08e2c42d7486a113345ec24ce5555d963ef2c072a3f4b77ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/eu/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/eu/thunderbird-60.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "d8c50713410ee2fe8896e603cba9e04685c8dd277aba9dc2270a2e0d282a609e1feab44398007e9aa96cc0e43997598c6aa702a231d568dafa7f96a8be548e31"; + sha512 = "f3e5ab6e80ef67fb7b05e08dcaab138475f4feede719939a055c0c548a719902a1bd9b7c18c4a76d5e7173f5a01a319c56579c41059a1888fd29bd43f78666ca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/fi/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/fi/thunderbird-60.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "215394b3f4cab3b44d337adb56308b432c62000a592b9ee3b8e985636a6f3fec9189de64c9aba32ae1753b0ea085dca312b1696844aa658356ca9f96a0b7f255"; + sha512 = "b034c2fc5f633e4cc5b9f3258d7073439e805371833e7dccea9e8a7c9bc52ea7bb862642eb32bc02cacf2f114ff9b379edc22eb0df52ce676db52f67a3d48672"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/fr/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/fr/thunderbird-60.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "041c325d7015725fd81c31a1709017ee3091321187c39f84173fa5fa9c963a111e3a3bd0eb85f63a246c5a101e94d536bd0cf4a5d22b6e6bbd5fc284dcb3c965"; + sha512 = "bdc4222ef8f15ec73297b0b1382e2e6da638d103e70c0a00adb5f3aff3b4944be1149f4099cde60e7e0daab273775959110e2354834641f6c85ddcc3f1b8303f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/fy-NL/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/fy-NL/thunderbird-60.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "6f18bf01a6ca108f13b02b8cff1175640efd9c945827f28301c859858b47f238db7a5481a495c18ae5fab2639e8e3799441e0690ff52dd03d8772ca41f03c641"; + sha512 = "d4ccbbed8cd929c385369c7df9b9d031e4e06600cf8d08449d9e60844aad2ccafbb6517327882cecf1e25786a573e2878f15d841851cf30c72646eea7cd028d9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/ga-IE/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ga-IE/thunderbird-60.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "da5509e03c4ecb8f8ab4e6e5c23218af04f4415eec33f62b5f9a48f5d7bd6cbd4d7c583439ae6fe71f009f4287a9a02b188c37a326e3a0683654c766849d25c5"; + sha512 = "c89c2ff0a5c06ce0df29300ac2e1ba034b39b021487ddf86e870138dd165459a71dc250a066df1622e4ebec1813b1c315eaeadaad5da6afa522ca2208222f1d7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/gd/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/gd/thunderbird-60.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "56b1ed5fd7f63e68ee8ae7d291ebbca6881ccbb9c0481430dac23851ac4bd23ec98ffb93ba846f58d216094f55781ca2197717dcc21427dc3873f6e992b67032"; + sha512 = "5f1ab74c7492a6a52b1ddbd38f7b9f85f59bd911cf8a64084d1eb35715f0b9cd45a7650dcfa9771679ac6255eed99dafc0becb8b3e32e315e7d186e118b56afb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/gl/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/gl/thunderbird-60.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "5a6bbd8729b1c263bee0e31f544b2137a0166e07d6ebf015573e8da51e91735c467c065ab40e2c330c62a0e9c86d2b2cb302949234d746c7c743f6864f3eabe4"; + sha512 = "690915f4e182b5ecab32675aa03616a2f51f7a4e795991cdfece82f63f074e2d8057d6e87ebf9f74dcc5acd149b1dc844517bee19de3d959a493cb64b51e6158"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/he/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/he/thunderbird-60.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "90998ad6963a3258a5790caf4d36a34348fcacbbf9ba9ef87a8aa8ad1fde35bf146835434754f9421282ea1e36084660d149f28b75c8d422b84232d420810a35"; + sha512 = "ea589ef7a9b4897beb23b4595c830fa14e7021472dbab815fb15325e99cf858a28b7265d43df0629d2196c1563a769f36beae1ca048fa3c006cd97d54e923ecf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/hr/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/hr/thunderbird-60.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "727f2ec4f04b32adc2a2dd1b9e5af6de0963334abeeb4582a68fbacaabf7720251a3d5280fd7b1d8e6660747b5ea9ffc94a658d1d95651b8d3a232b15437fe23"; + sha512 = "e5b8e4cf40819c9b83339520e832773e3161c9c38c802ca37fe512616f128163bcc2d1e7a40ea6e0bb754973a782f141ed044c4be3a0cb7a39685326a1c3a8e5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/hsb/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/hsb/thunderbird-60.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "213cfe86cf7025f76dca4af15d42d5d9fd676411d8fd64069f82ef34de7ae3de6208b0ea21c77604e6c19b9c015b9c4fe8de783de625a4345bb69f2a69a6ea3c"; + sha512 = "81382e35b825b65f95508cf04bdeb1a8709f2cd7b408f3dc068cb75d4c5ec31bdbead8807008c78599bc11043f77437013242f9969333c46e10d9ba4a8e563cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/hu/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/hu/thunderbird-60.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "97ad1bc5c2c29e7fac01832d44337c79b05e3ddf6dccbc41caece5c249f9ab46ca0a9ae469d0b5a923ecbd43ec4f910b70af81010d9f9b8f35a9741efbc9bc6f"; + sha512 = "190794f6fa1ffdbfc2b8516cf0c954a9abf8408aa04c1d9c51e1a601f8a1d3d8fc32e2ca9644bcd1e11e8cfc47982c55995b2daadbbbafcc713b4c6f5c8aa63e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/hy-AM/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/hy-AM/thunderbird-60.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "7738216dd50fc7a837080770fee652db2091a156623097f04e038a94c456e334af4939973960593ca915da14573263668b08dc7359e3d5a77ddb6c89c18c7efa"; + sha512 = "a6cc1ebcf284fb7b4fa0873768713dc569efdb39982f37131499434577ab5515448caaa5fac776987bc008074ac6c04eb29e2f60e21626b06dac2dfd17ee09c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/id/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/id/thunderbird-60.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "bef209d87eff0a4ba061c50c1a20937e6052941e3655d92c17eccd79657542db5a6deb68fbb2b25b2c0d5add872d86f4414b761c4f167c289d58238e21dea59e"; + sha512 = "4333f727d2e310bb24e6f266b748d757683523d6c3414c68169bc1a7852edad8d76bc3021aea01bc08e7d95c5fe4da16281306236cb6eca6f3e339cd5cc11fa0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/is/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/is/thunderbird-60.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "7f939bdca0369eb70a47d8df6f3e453a9b5472f7f3c78bce73380d6f72ec46c74bceab5087ecd4f4516fd0a405a6c70ebc19295da819e037f553f688df33b213"; + sha512 = "f26d7117241a090de6675e3a336b5b0c9b5462acc80248d6e41bf43f8c990a761ce36e6d0a4620a1733d06f5bf7cd8511c88f686b9ae0806f23f5a852be3c0d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/it/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/it/thunderbird-60.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "289a0db383c7d5ee0fc064867f8821c7f445facb37387229289a1f507174df7cffb390c19bbfec438a4e20c727769688f64000e0e2fbf17273fa21419c770070"; + sha512 = "33dfd7890b6c156b907e40c5442795c8549053362d65272bd08a5ddaeda61783ec914d8c917a7b9731885aff766011b9a667307ee01cac79614eb84133bc8675"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/ja/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ja/thunderbird-60.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "5b9920d334675cea0d603cf2eac923c55f234af5fab69f0002f3a2ae0afbb0a003e8f228448d5485d14543b65494ae7f5add6b28305bde1fa8a4792102d948d9"; + sha512 = "4ed858b1a1411472bc2029ce1396b78a00f25cabfc2232f6e3daf0acfe91898df769c2397f908db52759c32efc25a79d9d39efa99891a68e2b7d5b7c13820a23"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/kab/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/kab/thunderbird-60.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "6ad1cdef0c168d5a7e4d1e26f01354f12c7249440319132fdc07398a395074916576b7047762c231b05b039fa250c5f2fd4e9f6f85f85d2626fcd4fe58ae64b2"; + sha512 = "61e8b05c0c952eb493fb5f35b7ce6ee1da586a7a4d25f27224f36b7afae75a0f217717f5afac17b43f763b2f6403f4c50ed01c1d1dc6dd084d24f8821566b552"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/ko/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/kk/thunderbird-60.0.tar.bz2"; + locale = "kk"; + arch = "linux-i686"; + sha512 = "507ad5d46263ada1fb9b3d05f2c6d1a00b76f5d25fe9459edafcb2793070b6771ff52b338bc9963c1810a46740ea1e22ed330a5b935bfef72437b572f0214e67"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ko/thunderbird-60.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "090a467a7d8ef9f3ba759684cbea8625624f5481b890bd47098e7bbc94017934457cc2ec0a7225f6486a537860c08f695cef60c3ea4bf32b1937c87a66c66c7a"; + sha512 = "2550ae6cd5e8ee1fb6fc0b3fd974c1028edf8b292da72b57d6e27fe2e600d6418c6f4ca2c9d5535cbf1f1c67b20713cfef5732beae79ceebe328f44a73023b69"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/lt/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/lt/thunderbird-60.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "cd0190ffa07115f584718eb8a6c9e94dbe0c883ae48e5f4d5a86caf8db599d37d8e47d2402bd35625c0fdf752194d86a3bfb6a24f3010f0db2e5fcc5aab823fe"; + sha512 = "29e47bd8306507fd65d27892863b9cd0b58cff4d2035f7c0d3df8cfb98ddc890e922c0e54e0177b255b6bda70116a72fa630494b7ead05683f928c1a3f6bfed3"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ms/thunderbird-60.0.tar.bz2"; + locale = "ms"; + arch = "linux-i686"; + sha512 = "fec173bea9f579e605ea3b40510f26d0cd94ae96ca465f2b6b829eb710fd3154ce6b997c3951b12165491b8d57af8371517a23ec73615b3b53e463b6077efe96"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/nb-NO/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/nb-NO/thunderbird-60.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "6efb9bbd8f0fee9ab584d2b78425bf89d4dac2b2e7c1da745b922202691698add874b1b3d61b93a17de6256851667c25e7f13cd62591e7a47102c3ac07f8bc1d"; + sha512 = "1f15c20580104e6bbfcf07d234ac987e2d35eadeff5437369f62b34acb8b47dd646c365c31e2c5601c675a413cc0d2d73fff6f4a663436b426331d373725aee5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/nl/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/nl/thunderbird-60.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "ff2860ebe75ae4d542de0f9d7d7351140097367db16728054a97ae23d74c1c357d02bcbd4e05f0f98364ee80fb6054ae7cfdf60307d43da198b2bba20b17bd6f"; + sha512 = "5f1b20753423ed3882625309ad91e3a6c0931984b502e395cd56d5701eaa6612ba547d996c608b5d87f521989900eb4f02a419036b4f1c9312f9d763bf68e89d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/nn-NO/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/nn-NO/thunderbird-60.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "96a61cbbeb647820e92c268d2a6ffd1578e56a8517a415689c97548f3d218fb26711cd737d6fd682127f9704a6f4ef11f0722620f8ed44379e08cef3945f727d"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/pa-IN/thunderbird-52.9.1.tar.bz2"; - locale = "pa-IN"; - arch = "linux-i686"; - sha512 = "83dbd6b5d49ebbcb7b5fbccb0c120b85adaa6085664416921bd06659deeece1a7d27bcd567a47322e81da4793da62c8b54e4f6a751645e8c7add0c362b473d84"; + sha512 = "2a7964d792058c973940cb99add2862f61e66e6ce0cf6988c6b0395274b8791a09f81730a403748962b56be8a183c5d8e063cc8b7e93e166a1d508c8f274ad16"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/pl/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/pl/thunderbird-60.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "dd2bc656bc7ab1e21121eaa9903c63056647c31da6fa55c816c458684235559a2b2d9668e200e73f54e9b7c34bb6d0c905c0a31c6153494e16131f7e0ce9c9ed"; + sha512 = "49e372e264e902eac027db402d5e53683efcdf67faa41696113f7e963dabb85e6fbb8f58759460bb3fefc67ad52100a1d204884dcbafc39ab08e46059f72124e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/pt-BR/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/pt-BR/thunderbird-60.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "83c09f9b314ff82ff59ced594709eff7a0d55c9a7f1c064917ebc3820946ef69aaf509da79cf447f618b3afaab648e4990797724c671ba850655559190a1647f"; + sha512 = "201398c2c58e55b9d311f87d445727a0a3c455167febe23a597ec97fe80ca189aff3557d8ac0e1957443251af184542d071229664f0a78de2faf31dcf337d951"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/pt-PT/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/pt-PT/thunderbird-60.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "bf6c986e8b43f725a1541c0ac7c880384be40f2c90ffc87e598c177644bd32b2b07bc56be58c2db4f1aca64c4c6590a30199d9f93b7a5fd2d52a9d916ca309f1"; + sha512 = "88ba0c8dc4665305c85e00a0f50ff4247abf1a5925436d717c082c4934a6df41f9d45c45ac458598167bfae8633e3fa2c12f938e32480b956b2a61527c677af2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/rm/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/rm/thunderbird-60.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "3f07918c0f7ae7117daccd382220aea3e132fa759c25948883c1d97b936e4302fbe6fe176ca4c109f9a35c580d46a7578561c2d2909364b5e915c66d80308cd1"; + sha512 = "f121ad8ca5ee662a9b815d547352b21f7cf46bbabcf12f21617f857821e8a2b303a915fb1b3b3676684a0e79b30c9d97ba34a9223794616b4fd79f85f562d264"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/ro/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ro/thunderbird-60.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "5c0a230ee4d49e6c5d6234480f288788a0b01bea44f85e29f336c5280cbc507da30e681df26938acf8f7d1b67ddd52fc5082d1019df0474ade399a27f1fdff26"; + sha512 = "a0bff4872cb8186eb187fb7b366a5469cb2f8bbc5c42296195a104432b91e99b4729515d4808651f61faa585979966be903453a75524001b619350b66a6f2349"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/ru/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ru/thunderbird-60.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "43ac720dedc608f49107d29119d699c9c1ab4e7d0f62608e44ba4ae55f9c669d5adacf9e11e7fcdc9e8dcddaf87b1a237202e3a6805a0cbaf803df28ddff13ad"; + sha512 = "e5eb22490436cb0c1456af5f7019b2b1b77dbdc4b68fb9d0d693a8502acde51027a90335ea4adb1b030cb4557ffdcefc8caec423110fbdc40f0c30bd269e1e45"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/si/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/si/thunderbird-60.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "338af5daa9c2ba21c47c0aaa449172c3ce315fb8c1d04e522ed77fc986d539c2c15ebe5bda80688d568fa3671b3e32579b00fa4c834c0950db5773109e7aae7e"; + sha512 = "830965b9d551665e84646e865e66aeabe6082308278669fce95e005643ba5807a0fc17ec294043f5ce908676a53b88ac64d9234b56571dbbb22b5a5de66aefac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/sk/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/sk/thunderbird-60.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "30e69e3c3252f3fc2bf8a9efbc19ece01728a8a79deafc42bcc5dfe92d15174816e510a9324e950cb3135f84bdb6587d00eb31a330b94dd330eab0cf35342724"; + sha512 = "40fca2d6bc9d2dea9df6ad7c153bcffcd30687c0fcce17b78583501dda379994ad706f28003248ed2cb62b0a3f0d510c203b7d4eca2f071be6f2d670f7f04c76"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/sl/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/sl/thunderbird-60.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "0bd8ff9143652e5363a7c5e1fca0d0694c3891f83c63b2c3c06d4fac245efed31bdb486cdc41f4c5a615fcb1d1a502e6cbac3bdafa7d6e906f19ae6bd215fdc7"; + sha512 = "0881ee4832639fe79201260f8c0c755bd2d4bdac7ce5a422a37b9798901815b5b7ee1eefda9d3f82c1d49fbd0c6174ffa3aa5cc850aa260af7133d60b0685ad3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/sq/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/sq/thunderbird-60.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "294d17e1b5157fc7e168cf29bed2c9750775f6913375e745a66fdc7d70cf7ed783b7cf731c5090cd38803f60b0839e76ee4f260c248b73b675f4a78e5e301bab"; + sha512 = "df1d0639030a33ecd4e0e336aff064dc87daf423ce7c8a6a0279f1a92d3cec4406ff0054eec1c911812f0ec6074308c8e66180e1adf919d366a8b6f138a6ef36"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/sr/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/sr/thunderbird-60.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "93f8a5c9e17ae9f577ee9746849fc46158e54d6bd550b5ce20e056707b3c05361f717b40637e1539aecc95f223318dd4311aff34dc511dee8507bf2622cf883d"; + sha512 = "ce264e4a8b5bc11396832533c1dfcfe43b601d4b4e8dad3d3b03c285732ab6b5fba50b90e28dfd883468cdab06e4f726d46478aa8b9e2b3a244c515288fef0bc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/sv-SE/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/sv-SE/thunderbird-60.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "3555a2d623ece9921bd6acbff45459da7a51de28494f0915639c76066b3b3bf91279716f2c42b5e5d78d09216a6fe6f5be88ab4dba1d2172852ca51d93a634b6"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/ta-LK/thunderbird-52.9.1.tar.bz2"; - locale = "ta-LK"; - arch = "linux-i686"; - sha512 = "203bb717b4fa77522dcee2a85cf0c0d8997abc6ac565ad908ab4eba8f7bb37e848fb94a0526c0fd8360569c9cf3c98cb82196e38cd930b11d82cad6cd88d8f5d"; + sha512 = "da5e8ee2e9fc35a605481f7351b0391d8ca056ce7f152a5e46b3b91b539f5e35b1ecb0067cd8fdd26f249393d45e22e61d318c9687d66b52accb59e8b3283e13"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/tr/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/tr/thunderbird-60.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "214b140e3c18a2fd4b936558f4bb80441bec9d2afc79e0a949365d2e20b3fa1a092aab332b307c674b7a1cd3822e428459992fdfa5f56b534733021e5fcc11c9"; + sha512 = "546c6ed7113af0c52aaa69630561637789381a5e97f2edea3415d14a88edc25124a64427c3a1e1a75e8c4019468aed0ebf4d6ff56ecf26ed1c64eee6b69ee777"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/uk/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/uk/thunderbird-60.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "28a003f1c5c0135a978187e68779500caff1eed42b4da846cd2d5025835fe80ac6ef9cb0424d4a4bd339680666d9a2ca2526b46ffd9ba6b5b0bb725c5c4a7e71"; + sha512 = "ce3386e90c77fae05c79d4e30abb723fba507e4655bee6667edca9de048c8854184af5c8775b10f2b7560dc9e6e95bbe7b8db79a345e590211cb56ad313f288a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/vi/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/vi/thunderbird-60.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "e2e79d972802b9c9b6319e147b741814f63dc7c5ecb663461483a5fcec45184c9a245752486f4411d961cf7d4da3ad41aeeb52364605ed78058bf53826fb0667"; + sha512 = "9bce245422e162e017198782778995ecc1ac1e2760ca91864605e3002042576a9c53519f085f6159e1654a4dff7dddc19f9fd1dda0a9f4cb9b616baeba8845d5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/zh-CN/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/zh-CN/thunderbird-60.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "05554421534038c4a02cefc68ee9e116d15aa8b607be06de2be7cb7ef794157f6b01533f5a670d739284632faea10b374ad6912f6c332ca4fd5f0e8d0346efe8"; + sha512 = "db756f120fc2ecfa3478cf07935b12414f79f746a96b0e30f75496f2cb8a7d880b9f3017b12122f0cdc0f64d10ae738da9c026aa9c533dbdaa6e0f38e5a71ee7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/zh-TW/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/zh-TW/thunderbird-60.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "e2b3081e08f87891a0559456fc74d8d3647d49cd14176abd5155aa8ca5d1e1394638386c6c27b433e581d539ac76d151e37dd4942df2e8646134a0218ef54e77"; + sha512 = "b589e9f472681bc9ddb5909197db2acf8b54e610998d00df4731c6a1403c5b865334aef2e072b3c7ac0694175f0e7cda6864809fc6079f95681b508267d90a59"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 85c98742af383..d925838e642ca 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -6,6 +6,7 @@ , icu, libpng, jemalloc , autoconf213, which, m4 , writeScript, xidel, common-updater-scripts, coreutils, gnused, gnugrep, curl +, cargo, rustc, llvmPackages , enableGTK3 ? false, gtk3, gnome3, wrapGAppsHook, makeWrapper , enableCalendar ? true , debugBuild ? false @@ -20,22 +21,16 @@ let wrapperTool = if enableGTK3 then wrapGAppsHook else makeWrapper; + gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; in stdenv.mkDerivation rec { name = "thunderbird-${version}"; - version = "52.9.1"; + version = "60.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "0ipvhllvlkcjshf2h938d531wpgnhbvdw1k088iazqamb3vrspxpfb4dhfrxvff995nym0gs7j5wa6bjd36nm4wajlabs5i6r80ms0d"; + sha512 = "1933csh6swcx1z35lbxfkxlln36mx2mny28rzxz53r480wcvar8zcj77gwb06hzn6j5cvqls7qd5n6a7x43sp7w9ykkf4kf9gmlccya"; }; - # New sed no longer tolerates this mistake. - postPatch = '' - for f in mozilla/{js/src,}/configure; do - substituteInPlace "$f" --replace '[:space:]*' '[[:space:]]*' - done - ''; - # from firefox, but without sound libraries buildInputs = [ gtk2 zip libIDL libjpeg zlib bzip2 @@ -50,11 +45,11 @@ in stdenv.mkDerivation rec { ++ lib.optionals enableGTK3 [ gtk3 gnome3.defaultIconTheme ]; # from firefox + m4 + wrapperTool - nativeBuildInputs = [ m4 autoconf213 which gnused pkgconfig perl python wrapperTool ]; + nativeBuildInputs = [ m4 autoconf213 which gnused pkgconfig perl python wrapperTool cargo rustc ]; configureFlags = [ # from firefox, but without sound libraries (alsa, libvpx, pulseaudio) - "--enable-application=mail" + "--enable-application=comm/mail" "--disable-alsa" "--disable-pulseaudio" @@ -66,6 +61,7 @@ in stdenv.mkDerivation rec { "--with-system-libevent" "--with-system-png" # needs APNG support "--with-system-icu" + "--enable-rust-simd" "--enable-system-ffi" "--enable-system-hunspell" "--enable-system-pixman" @@ -79,18 +75,29 @@ in stdenv.mkDerivation rec { "--enable-jemalloc" "--disable-gconf" "--enable-default-toolkit=cairo-gtk${if enableGTK3 then "3" else "2"}" + "--enable-js-shell" ] ++ lib.optional enableCalendar "--enable-calendar" ++ (if debugBuild then [ "--enable-debug" "--enable-profiling"] else [ "--disable-debug" "--enable-release" "--disable-debug-symbols" "--enable-optimize" "--enable-strip" ]) - ++ lib.optional enableOfficialBranding "--enable-official-branding"; + ++ lib.optional enableOfficialBranding "--enable-official-branding" + ++ lib.optionals (lib.versionAtLeast version "56" && !stdenv.hostPlatform.isi686) [ + # on i686-linux: --with-libclang-path is not available in this configuration + "--with-libclang-path=${llvmPackages.libclang}/lib" + "--with-clang-path=${llvmPackages.clang}/bin/clang" + ]; enableParallelBuilding = true; preConfigure = '' + cxxLib=$( echo -n ${gcc}/include/c++/* ) + archLib=$cxxLib/$( ${gcc}/bin/gcc -dumpmachine ) + + test -f layout/style/ServoBindings.toml && sed -i -e '/"-DRUST_BINDGEN"/ a , "-cxx-isystem", "'$cxxLib'", "-isystem", "'$archLib'"' layout/style/ServoBindings.toml + configureScript="$(realpath ./configure)" mkdir ../objdir cd ../objdir @@ -106,14 +113,14 @@ in stdenv.mkDerivation rec { postInstall = '' # For grsecurity kernels - paxmark m $out/lib/thunderbird-[0-9]*/thunderbird + paxmark m $out/lib/thunderbird/thunderbird # TODO: Move to a dev output? rm -rf $out/include $out/lib/thunderbird-devel-* $out/share/idl # $binary is a symlink to $target. # We wrap $target by replacing the $binary symlink. - local target="$out/lib/thunderbird-${version}/thunderbird" + local target="$out/lib/thunderbird/thunderbird" local binary="$out/bin/thunderbird" # Wrap correctly, this is needed to @@ -139,7 +146,7 @@ in stdenv.mkDerivation rec { name = "thunderbird"; exec = "thunderbird %U"; desktopName = "Thunderbird"; - icon = "$out/lib/thunderbird-${version}/chrome/icons/default/default256.png"; + icon = "$out/lib/thunderbird/chrome/icons/default/default256.png"; genericName = "Mail Reader"; categories = "Application;Network"; mimeType = stdenv.lib.concatStringsSep ";" [ @@ -163,8 +170,8 @@ in stdenv.mkDerivation rec { # Fix notifications. LibXUL uses dlopen for this, unfortunately; see #18712. '' patchelf --set-rpath "${lib.getLib libnotify - }/lib:$(patchelf --print-rpath "$out"/lib/thunderbird-*/libxul.so)" \ - "$out"/lib/thunderbird-*/libxul.so + }/lib:$(patchelf --print-rpath "$out"/lib/thunderbird*/libxul.so)" \ + "$out"/lib/thunderbird*/libxul.so ''; doInstallCheck = true; diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index a82891a8f35f1..6e87735a9f657 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -6,13 +6,13 @@ let pname = "liferea"; - version = "1.12.3"; + version = "1.12.4"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2"; - sha256 = "0wm2c8qrgnadq63fivai53xm7vl05wgxc0nk39jcriscdikzqpcg"; + sha256 = "12852qp174nsg770cry7y257vfzl53hpy46h5agaimrfsc41mgln"; }; nativeBuildInputs = [ wrapGAppsHook python3Packages.wrapPython intltool pkgconfig ]; diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index d5966845a0b7e..9bb266665a63d 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { homepage = https://owncloud.org; maintainers = [ maintainers.qknight ]; platforms = platforms.unix; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix index 7c5014018242e..2c13cc23b014f 100644 --- a/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/pkgs/applications/networking/protonmail-bridge/default.nix @@ -2,7 +2,7 @@ libsecret, libGL, libpulseaudio, glib, makeWrapper, makeDesktopItem }: let - version = "1.0.5-1"; + version = "1.0.6-1"; description = '' An application that runs on your computer in the background and seamlessly encrypts @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://protonmail.com/download/protonmail-bridge_${version}_amd64.deb"; - sha256 = "1fsf4l5c9ii370fgy721a71h34g7vjfddscal3jblb4mm3ywzxfl"; + sha256 = "1as4xdsik2w9clbrwp1k00491324cg6araz3jq2m013yg1cild28"; }; nativeBuildInputs = [ makeWrapper ]; @@ -35,11 +35,11 @@ in stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -p $out/{bin,lib,share} - mkdir -p $out/share/{applications,icons/hicolor/scalable/apps} + mkdir -p $out/{bin,lib,share/applications} + # mkdir -p $out/share/{applications,icons/hicolor/scalable/apps} cp -r usr/lib/protonmail/bridge/Desktop-Bridge{,.sh} $out/lib - cp usr/share/icons/protonmail/Desktop-Bridge.svg $out/share/icons/hicolor/scalable/apps/desktop-bridge.svg + # cp usr/share/icons/protonmail/Desktop-Bridge.svg $out/share/icons/hicolor/scalable/apps/desktop-bridge.svg cp ${desktopItem}/share/applications/* $out/share/applications ln -s $out/lib/Desktop-Bridge $out/bin/Desktop-Bridge diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index 4c1ddcef5cc87..e07bf7958f3f4 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, autoconf, automake, pkgconfig, libtool -, gtk2, halibut, ncurses, perl }: +, gtk2, halibut, ncurses, perl +, hostPlatform, lib }: stdenv.mkDerivation rec { version = "0.70"; @@ -13,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1gmhwwj1y7b5hgkrkxpf4jddjpk9l5832zq5ibhsiicndsfs92mv"; }; - preConfigure = '' + preConfigure = lib.optionalString hostPlatform.isUnix '' perl mkfiles.pl ( cd doc ; make ); sed -e '/AM_PATH_GTK(/d' \ @@ -21,13 +22,25 @@ stdenv.mkDerivation rec { -e '/AC_OUTPUT/iAM_PROG_AR' -i configure.ac ./mkauto.sh cd unix + '' + lib.optionalString hostPlatform.isWindows '' + cd windows ''; + TOOLPATH = stdenv.cc.targetPrefix; + makefile = if hostPlatform.isWindows then "Makefile.mgw" else null; + + installPhase = if hostPlatform.isWindows then '' + for exe in *.exe; do + install -D $exe $out/bin/$exe + done + '' else null; + nativeBuildInputs = [ autoconf automake halibut libtool perl pkgconfig ]; - buildInputs = [ gtk2 ncurses ]; + buildInputs = [] + ++ lib.optionals hostPlatform.isUnix [ gtk2 ncurses ]; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A Free Telnet/SSH Client"; longDescription = '' PuTTY is a free implementation of Telnet and SSH for Windows and Unix @@ -36,6 +49,6 @@ stdenv.mkDerivation rec { ''; homepage = https://www.chiark.greenend.org.uk/~sgtatham/putty/; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix ++ platforms.windows; }; } diff --git a/pkgs/applications/networking/siproxd/default.nix b/pkgs/applications/networking/siproxd/default.nix index 14ed2587e6365..cd697f107b358 100644 --- a/pkgs/applications/networking/siproxd/default.nix +++ b/pkgs/applications/networking/siproxd/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { description = "A masquerading SIP Proxy Server"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/office/jameica/default.nix b/pkgs/applications/office/jameica/default.nix new file mode 100644 index 0000000000000..7b804151d4a73 --- /dev/null +++ b/pkgs/applications/office/jameica/default.nix @@ -0,0 +1,90 @@ +{ stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, ant, jdk, jre, xmlstarlet, gtk2, glib, xorg, Cocoa }: + +let + _version = "2.8.1"; + _build = "449"; + version = "${_version}-${_build}"; + name = "jameica-${version}"; + + swtSystem = if stdenv.system == "i686-linux" then "linux" + else if stdenv.system == "x86_64-linux" then "linux64" + else if stdenv.system == "x86_64-darwin" then "macos64" + else throw "Unsupported system: ${stdenv.system}"; + + launcher = '' + #!${stdenv.shell} + exec ${jre}/bin/java -Xmx512m ${ stdenv.lib.optionalString stdenv.isDarwin ''-Xdock:name="Jameica" -XstartOnFirstThread''} de.willuhn.jameica.Main "$@" + ''; + + desktopItem = makeDesktopItem { + name = "jameica"; + exec = "jameica"; + comment = "Free Runtime Environment for Java Applications."; + desktopName = "Jameica"; + genericName = "Jameica"; + categories = "Application;Office;"; + }; +in +stdenv.mkDerivation rec { + inherit name version; + + nativeBuildInputs = [ ant jdk makeWrapper xmlstarlet ]; + buildInputs = stdenv.lib.optionals stdenv.isLinux [ gtk2 glib xorg.libXtst ] + ++ stdenv.lib.optional stdenv.isDarwin Cocoa; + + src = fetchFromGitHub { + owner = "willuhn"; + repo = "jameica"; + rev = "V_${builtins.replaceStrings ["."] ["_"] _version}_BUILD_${_build}"; + sha256 = "1w25lxjskn1yxllbv0vgvcc9f9xvgv9430dm4b59ia9baf98syd2"; + }; + + # there is also a build.gradle, but it only seems to be used to vendor 3rd party libraries + # and is not able to build the application itself + buildPhase = '' + (cd build; ant init compile jar) + ''; + + # jameica itself loads ./plugin.xml to determine it's version. + # Unfortunately, the version attribute there seems to be wrong, + # so it thinks it's older than it really is, + # and refuses to load plugins destined for its version. + # Set version manually to workaround that. + postPatch = '' + xml ed -u '/system/@version' -v '${version}' plugin.xml > plugin.xml.new + mv plugin.xml.new plugin.xml + ''; + + installPhase = '' + mkdir -p $out/libexec $out/lib $out/bin $out/share/applications + + # copy libraries except SWT + cp $(find lib -type f -iname '*.jar' | grep -ve 'swt/.*/swt.jar') $out/lib/ + # copy platform-specific SWT + cp lib/swt/${swtSystem}/swt.jar $out/lib + + install -Dm644 releases/${_version}-*/jameica/jameica.jar $out/libexec/ + install -Dm644 plugin.xml $out/libexec/ + install -Dm644 build/jameica-icon.png $out/share/pixmaps/jameica.png + cp ${desktopItem}/share/applications/* $out/share/applications/ + + echo "${launcher}" > $out/bin/jameica + chmod +x $out/bin/jameica + wrapProgram $out/bin/jameica --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath buildInputs} \ + --set CLASSPATH "$out/libexec/jameica.jar:$out/lib/*" \ + --run "cd $out/libexec" + # jameica expects its working dir set to the "program directory" + ''; + + meta = with stdenv.lib; { + homepage = https://www.willuhn.de/products/jameica/; + description = "Free Runtime Environment for Java Applications."; + longDescription = '' + Runtime Environment for plugins like Hibiscus (HBCI Online Banking), + SynTAX (accounting) and JVerein (club management). + ''; + license = licenses.gpl2Plus; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + maintainers = with maintainers; [ flokli ]; + }; +} diff --git a/pkgs/applications/science/astronomy/gildas/aarch64.patch b/pkgs/applications/science/astronomy/gildas/aarch64.patch new file mode 100644 index 0000000000000..40696a03dec71 --- /dev/null +++ b/pkgs/applications/science/astronomy/gildas/aarch64.patch @@ -0,0 +1,12 @@ +diff -ruN gildas-src-jul18a/admin/define-system.sh gildas-src-jul18a.aarch64/admin/define-system.sh +--- gildas-src-jul18a/admin/define-system.sh 2018-06-12 15:22:32.000000000 +0200 ++++ gildas-src-jul18a.aarch64/admin/define-system.sh 2018-07-21 13:05:52.000000000 +0200 +@@ -174,7 +174,7 @@ + DEFAULT_CONFIG= # Default config is empty + case `uname` in + Linux) +- if [ `uname -m | grep -c "x86_64"` -ne 0 ]; then ++ if [ `uname -m | grep -c "64"` -ne 0 ]; then + GAG_MACHINE=x86_64 + else + GAG_MACHINE=pc diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix index bd4587bf22768..7ede379fb4990 100644 --- a/pkgs/applications/science/astronomy/gildas/default.nix +++ b/pkgs/applications/science/astronomy/gildas/default.nix @@ -7,13 +7,13 @@ let in stdenv.mkDerivation rec { - srcVersion = "jun18a"; - version = "20180601_a"; + srcVersion = "jul18a"; + version = "20180701_a"; name = "gildas-${version}"; src = fetchurl { - url = "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.gz"; - sha256 = "0k4x0g69fphb1759cwcw6bbs8imwmq0qwj6zqixxk60skk4n4jvb"; + url = "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.gz"; + sha256 = "0kl3zf6b1kv8hgsfrarsnm2gnrdax3vi8f856249y4nxsa7lbv2i"; }; enableParallelBuilding = true; @@ -22,20 +22,16 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2-x11 lesstif cfitsio python27Env ]; - patches = [ ./wrapper.patch ./return-error-code.patch ./clang.patch ]; + patches = [ ./wrapper.patch ./return-error-code.patch ./clang.patch ./mod.patch ./aarch64.patch ]; configurePhase='' substituteInPlace admin/wrapper.sh --replace '%%OUT%%' $out substituteInPlace admin/wrapper.sh --replace '%%PYTHONHOME%%' ${python27Env} + substituteInPlace utilities/main/gag-makedepend.pl --replace '/usr/bin/perl' ${perl}/bin/perl source admin/gildas-env.sh -c gfortran -o openmp echo "gag_doc: $out/share/doc/" >> kernel/etc/gag.dico.lcl ''; - buildPhase='' - make depend - make - ''; - postInstall='' mkdir -p $out/bin cp -a ../gildas-exe-${srcVersion}/* $out diff --git a/pkgs/applications/science/astronomy/gildas/mod.patch b/pkgs/applications/science/astronomy/gildas/mod.patch new file mode 100644 index 0000000000000..c917b4674f130 --- /dev/null +++ b/pkgs/applications/science/astronomy/gildas/mod.patch @@ -0,0 +1,17 @@ +diff -ruN gildas-src-jul18a/admin/Makefile.build gildas-src-jul18a.mod/admin/Makefile.build +--- gildas-src-jul18a/admin/Makefile.build 2018-06-14 14:36:54.000000000 +0200 ++++ gildas-src-jul18a.mod/admin/Makefile.build 2018-07-06 13:31:46.000000000 +0200 +@@ -291,6 +291,13 @@ + win-$(LIB_IDENTITY)-und.def -o $@ $(FLDLIBS) $(LIB_DEPENDS) $(ADD_LIBS) $(SYS_LIBS)) + endif + ++# Dummy rules for modules just so that make consider the module a ++# valid dependency when first parsing the makefiles. This rule should ++# never be applied as the modules are a by-product of the compilation ++# of the object ++$(builddir)/%.mod: ++ echo "dummy" > /dev/null ++ + # Fortran executables + $(bindir)/% : $(builddir)/%.o | $(bindir) + $(FC) $(ALL_FLDFLAGS) $< $(OBJECTS) -o $@ \ diff --git a/pkgs/applications/science/biology/vcftools/default.nix b/pkgs/applications/science/biology/vcftools/default.nix index 394973692dca7..a6f52ae97b592 100755 --- a/pkgs/applications/science/biology/vcftools/default.nix +++ b/pkgs/applications/science/biology/vcftools/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "vcftools"; - version = "0.1.15"; + version = "0.1.16"; src = fetchFromGitHub { repo = pname; owner = "vcftools"; rev = "v${version}"; - sha256 = "15yxr4kidqb42gkbd6rjra6b07wpl6rgivlh9q73yavh5myafqk4"; + sha256 = "0msb09d2cnm8rlpg8bsc1lhjddvp3kf3i9dsj1qs4qgsdlzhxkyx"; }; buildInputs = [ autoreconfHook pkgconfig zlib perl ]; diff --git a/pkgs/applications/science/logic/sad/default.nix b/pkgs/applications/science/logic/sad/default.nix index 51ea9b9c0e766..426f1928938c7 100644 --- a/pkgs/applications/science/logic/sad/default.nix +++ b/pkgs/applications/science/logic/sad/default.nix @@ -7,7 +7,12 @@ stdenv.mkDerivation { sha256 = "10jd93xgarik7xwys5lq7fx4vqp7c0yg1gfin9cqfch1k1v8ap4b"; }; buildInputs = [ ghc spass ]; - patches = [ ./patch ]; + patches = [ + ./patch + # Since the LTS 12.0 update, <> is an operator in Prelude, colliding with + # the <> operator with a different meaning defined by this package + ./monoid.patch + ]; postPatch = '' substituteInPlace Alice/Main.hs --replace init.opt $out/init.opt ''; @@ -23,7 +28,7 @@ stdenv.mkDerivation { meta = { description = "A program for automated proving of mathematical texts"; longDescription = '' - The system for automated deduction is intended for automated processing of formal mathematical texts + The system for automated deduction is intended for automated processing of formal mathematical texts written in a special language called ForTheL (FORmal THEory Language) or in a traditional first-order language ''; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/applications/science/logic/sad/monoid.patch b/pkgs/applications/science/logic/sad/monoid.patch new file mode 100644 index 0000000000000..da9c21bcae918 --- /dev/null +++ b/pkgs/applications/science/logic/sad/monoid.patch @@ -0,0 +1,51 @@ +diff --git a/Alice/Core/Check.hs b/Alice/Core/Check.hs +index 0700fa0388f..69815864710 100644 +--- a/Alice/Core/Check.hs ++++ b/Alice/Core/Check.hs +@@ -18,8 +18,12 @@ + - along with this program. If not, see <http://www.gnu.org/licenses/>. + -} + ++{-# LANGUAGE NoImplicitPrelude #-} ++ + module Alice.Core.Check (fillDef) where + ++import Prelude hiding ((<>)) ++ + import Control.Monad + import Data.Maybe + +diff --git a/Alice/Core/Reason.hs b/Alice/Core/Reason.hs +index c361bcf220d..4e493d8c91b 100644 +--- a/Alice/Core/Reason.hs ++++ b/Alice/Core/Reason.hs +@@ -17,9 +17,12 @@ + - You should have received a copy of the GNU General Public License + - along with this program. If not, see <http://www.gnu.org/licenses/>. + -} ++{-# LANGUAGE NoImplicitPrelude #-} + + module Alice.Core.Reason where + ++import Prelude hiding ((<>)) ++ + import Control.Monad + + import Alice.Core.Base +diff --git a/Alice/Core/Verify.hs b/Alice/Core/Verify.hs +index 4f8550bdf11..0f59d135b16 100644 +--- a/Alice/Core/Verify.hs ++++ b/Alice/Core/Verify.hs +@@ -18,8 +18,12 @@ + - along with this program. If not, see <http://www.gnu.org/licenses/>. + -} + ++{-# LANGUAGE NoImplicitPrelude #-} ++ + module Alice.Core.Verify (verify) where + ++import Prelude hiding ((<>)) ++ + import Control.Monad + import Data.IORef + import Data.Maybe diff --git a/pkgs/applications/science/math/palp/default.nix b/pkgs/applications/science/math/palp/default.nix index 4c7df4412e4f4..e9fd21b46d8aa 100644 --- a/pkgs/applications/science/math/palp/default.nix +++ b/pkgs/applications/science/math/palp/default.nix @@ -19,6 +19,10 @@ stdenv.mkDerivation rec { "strictoverflow" # causes runtime failure (tested in checkPhase) ]; + patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace GNUmakefile --replace gcc cc + ''; + preBuild = '' echo Building PALP optimized for ${dim} dimensions sed -i "s/^#define[^a-zA-Z]*POLY_Dmax.*/#define POLY_Dmax ${dim}/" Global.h @@ -77,6 +81,6 @@ stdenv.mkDerivation rec { # the right license. license = licenses.gpl2; maintainers = with maintainers; [ timokau ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 85514ed47867e..592b348d03fd8 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -7,13 +7,13 @@ with stdenv.lib; buildGoPackage rec { name = "gitea-${version}"; - version = "1.4.3"; + version = "1.5.0"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; rev = "v${version}"; - sha256 = "0rl20dhj3in8w3ngix42qly077zrwg578aa2nxxznmn9k8xdvfpd"; + sha256 = "0gp777x8yjbqvz9i79qv3bn3hrlp1bn7ib57r7w5a7jmr9rd0nca"; }; patches = [ ./static-root-path.patch ]; diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix index 1fce30edbdf4e..2dd76b36d0576 100644 --- a/pkgs/applications/video/qstopmotion/default.nix +++ b/pkgs/applications/video/qstopmotion/default.nix @@ -1,20 +1,29 @@ -{ stdenv, fetchurl, qt5, ffmpeg, guvcview -, cmake, ninja, libxml2, gettext, pkgconfig, libgphoto2, gphoto2, v4l_utils -, libv4l, pcre }: +{ stdenv, lib, fetchurl, qt5, ffmpeg, guvcview, cmake, ninja, libxml2 +, gettext, pkgconfig, libgphoto2, gphoto2, v4l_utils, libv4l, pcre +, qwt, extra-cmake-modules }: stdenv.mkDerivation rec { pname = "qstopmotion"; - version = "2.3.2"; + version = "2.4.0"; name = "${pname}-${version}"; src = fetchurl { - url = "mirror://sourceforge/project/${pname}/Version_2_3_2/${name}-Source.tar.gz"; - sha256 = "1vbiznwyc05jqg0dpmgxmvf7kdzmlck0i8v2c5d69kgrdnaypcrf"; + url = "mirror://sourceforge/project/${pname}/Version_2_4_0/${name}-Source.tar.gz"; + sha256 = "0pbyq6nrr9g3crlsng660768167s0fybvcpzbfc0w9kkhs2jwrr2"; }; - buildInputs = [ qt5.qtbase ffmpeg guvcview v4l_utils libv4l pcre ]; + buildInputs = with qt5; [ v4l_utils libv4l pcre qtbase qtmultimedia ffmpeg guvcview + qwt qtquickcontrols qtimageformats qtxmlpatterns ]; - nativeBuildInputs = [ pkgconfig cmake ninja gettext libgphoto2 gphoto2 libxml2 libv4l ]; + nativeBuildInputs = [ pkgconfig cmake extra-cmake-modules ninja + gettext libgphoto2 gphoto2 libxml2 libv4l ]; + + patchPhase = '' + substituteInPlace CMakeLists.txt \ + --replace "find_package(Qt5 REQUIRED COMPONENTS Core Widgets Xml" \ + "find_package(Qt5 REQUIRED COMPONENTS Core Widgets Xml Multimedia" + grep -rl 'qwt' . | xargs sed -i 's@<qwt/qwt_slider.h>@<qwt_slider.h>@g' + ''; meta = with stdenv.lib; { homepage = http://www.qstopmotion.org; diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index 33e12d1098547..beecf72fd0b03 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -13,12 +13,12 @@ with stdenv.lib; stdenv.mkDerivation rec { baseName = "virt-viewer"; - version = "6.0"; + version = "7.0"; name = "${baseName}-${version}"; src = fetchurl { url = "http://virt-manager.org/download/sources/${baseName}/${name}.tar.gz"; - sha256 = "1chqrf658niivzfh85cbwkbv9vyg8sv1mv3i31vawkfsfdvvsdwh"; + sha256 = "00y9vi69sja4pkrfnvrkwsscm41bqrjzvp8aijb20pvg6ymczhj7"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/applications/window-managers/taffybar/default.nix b/pkgs/applications/window-managers/taffybar/default.nix index dfb2eec5dc553..681a5baec82c4 100644 --- a/pkgs/applications/window-managers/taffybar/default.nix +++ b/pkgs/applications/window-managers/taffybar/default.nix @@ -15,5 +15,6 @@ in stdenv.mkDerivation { meta = { platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/applications/window-managers/xmonad/log-applet/default.nix b/pkgs/applications/window-managers/xmonad/log-applet/default.nix index f2acf03958b6e..96f742df31059 100644 --- a/pkgs/applications/window-managers/xmonad/log-applet/default.nix +++ b/pkgs/applications/window-managers/xmonad/log-applet/default.nix @@ -1,45 +1,46 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, dbus-glib -, desktopSupport -, gtk2, gnome2_panel, GConf2 +, desktopSupport, xlibs +, gtk2 +, gtk3, gnome3, mate , libxfce4util, xfce4-panel }: -assert desktopSupport == "gnome2" || desktopSupport == "gnome3" || desktopSupport == "xfce4"; +assert desktopSupport == "gnomeflashback" || desktopSupport == "mate" || desktopSupport == "xfce4"; stdenv.mkDerivation rec { - version = "2.1.0"; + version = "unstable-2017-09-15"; pname = "xmonad-log-applet"; - name = "${pname}-${version}-${desktopSupport}"; + name = "${pname}-${desktopSupport}-${version}"; src = fetchFromGitHub { - owner = "alexkay"; + owner = "kalj"; repo = pname; - rev = "${version}"; - sha256 = "1g1fisyaw83v72b25fxfjln8f4wlw3rm6nyk27mrqlhsc1spnb5p"; + rev = "a1b294cad2f266e4f18d9de34167fa96a0ffdba8"; + sha256 = "042307grf4zvn61gnflhsj5xsjykrk9sjjsprprm4iij0qpybxcw"; }; - buildInputs = with stdenv.lib; - [ glib dbus-glib ] - ++ optionals (desktopSupport == "gnome2") [ gtk2 gnome2_panel GConf2 ] - # TODO: no idea where to find libpanelapplet-4.0 - ++ optionals (desktopSupport == "gnome3") [ ] - ++ optionals (desktopSupport == "xfce4") [ gtk2 libxfce4util xfce4-panel ] - ; - + buildInputs = [ glib dbus-glib xlibs.xcbutilwm ] + ++ stdenv.lib.optionals (desktopSupport == "gnomeflashback") [ gtk3 gnome3.gnome-panel ] + ++ stdenv.lib.optionals (desktopSupport == "mate") [ gtk3 mate.mate-panel ] + ++ stdenv.lib.optionals (desktopSupport == "xfce4") [ gtk2 libxfce4util xfce4-panel ] + ; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; - + configureFlags = [ "--with-panel=${desktopSupport}" ]; - + patches = [ ./fix-paths.patch ]; + # Setup hook replaces ${prefix} in pc files so we cannot use + # --define-variable=prefix=$prefix + PKG_CONFIG_LIBXFCE4PANEL_1_0_LIBDIR = "$(out)/lib"; + meta = with stdenv.lib; { - homepage = https://github.com/alexkay/xmonad-log-applet; + homepage = https://github.com/kalj/xmonad-log-applet; license = licenses.bsd3; description = "An applet that will display XMonad log information (${desktopSupport} version)"; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; - - broken = desktopSupport == "gnome3"; }; } diff --git a/pkgs/applications/window-managers/xmonad/log-applet/fix-paths.patch b/pkgs/applications/window-managers/xmonad/log-applet/fix-paths.patch index 031843afb172e..5e1fc7114dc82 100644 --- a/pkgs/applications/window-managers/xmonad/log-applet/fix-paths.patch +++ b/pkgs/applications/window-managers/xmonad/log-applet/fix-paths.patch @@ -1,50 +1,57 @@ -diff --git a/Makefile.am b/Makefile.am -index 619012d..dcc6d3c 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,4 +1,5 @@ - plugindir = $(PLUGIN_DIR) -+SESSION_BUS_SERVICES_DIR = $(prefix)/share/dbus-1/services - plugin_PROGRAMS = xmonad-log-applet - - xmonad_log_applet_SOURCES = main.c -diff --git a/configure.ac b/configure.ac -index ad4cffb..110c953 100644 --- a/configure.ac +++ b/configure.ac -@@ -27,28 +27,28 @@ AC_ARG_WITH( +@@ -20,7 +20,7 @@ + PKG_CHECK_MODULES(XCB, xcb xcb-ewmh) + + PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1 >= 0.80) +-SESSION_BUS_SERVICES_DIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1` ++SESSION_BUS_SERVICES_DIR=$prefix/share/dbus-1/services + AC_SUBST([SESSION_BUS_SERVICES_DIR]) + + AC_ARG_WITH( +@@ -32,35 +32,35 @@ AS_IF( [test "x$panel" = xgnome2], [PKG_CHECK_MODULES(LIBPANEL, libpanelapplet-3.0 >= 2.32.0)] - LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=prefix libpanelapplet-3.0`/share/gnome-panel/applets - PLUGIN_DIR=`$PKG_CONFIG --variable=prefix libpanelapplet-3.0`/libexec -+ LIBPANEL_APPLET_DIR=${prefix}/share/gnome-panel/applets -+ PLUGIN_DIR=${prefix}/libexec ++ LIBPANEL_APPLET_DIR=$prefix/share/gnome-panel/applets ++ PLUGIN_DIR=$prefix/libexec [AC_DEFINE(PANEL_GNOME, 1, [panel type])] [AC_DEFINE(PANEL_GNOME2, 1, [panel type])] , [test "x$panel" = xgnome3], [PKG_CHECK_MODULES(LIBPANEL, libpanelapplet-4.0 >= 3.0.0)] - LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=libpanel_applet_dir libpanelapplet-4.0` +- LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=libpanel_applet_dir libpanelapplet-4.0` - PLUGIN_DIR=`$PKG_CONFIG --variable=prefix libpanelapplet-4.0`/libexec -+ PLUGIN_DIR=${prefix}/libexec ++ LIBPANEL_APPLET_DIR=`$PKG_CONFIG --define-variable=prefix=$prefix --variable=libpanel_applet_dir libpanelapplet-4.0` ++ PLUGIN_DIR=$prefix/libexec [AC_DEFINE(PANEL_GNOME, 1, [panel type])] [AC_DEFINE(PANEL_GNOME3, 1, [panel type])] , + [test "x$panel" = xgnomeflashback], + [PKG_CHECK_MODULES(LIBPANEL, libpanel-applet >= 3.0.0)] +- LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=libpanel_applet_dir libpanel-applet` +- PLUGIN_DIR=`$PKG_CONFIG --variable=prefix libpanel-applet`/libexec ++ LIBPANEL_APPLET_DIR=`$PKG_CONFIG --define-variable=prefix=$prefix --variable=libpanel_applet_dir libpanel-applet` ++ PLUGIN_DIR=$prefix/libexec + [AC_DEFINE(PANEL_GNOME, 1, [panel type])] + [AC_DEFINE(PANEL_GNOMEFLASHBACK, 1, [panel type])] + , [test "x$panel" = xmate], - [PKG_CHECK_MODULES(LIBPANEL, libmatepanelapplet-3.0 >= 1.4.0)] -- LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=prefix libmatepanelapplet-3.0`/share/mate-panel/applets -- PLUGIN_DIR=`$PKG_CONFIG --variable=prefix libmatepanelapplet-3.0`/libexec -+ LIBPANEL_APPLET_DIR=${prefix}/share/mate-panel/applets -+ PLUGIN_DIR=${prefix}/libexec + [PKG_CHECK_MODULES(LIBPANEL, libmatepanelapplet-4.0 >= 1.4.0)] +- LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=prefix libmatepanelapplet-4.0`/share/mate-panel/applets +- PLUGIN_DIR=`$PKG_CONFIG --variable=prefix libmatepanelapplet-4.0`/libexec ++ LIBPANEL_APPLET_DIR=$prefix/share/mate-panel/applets ++ PLUGIN_DIR=$prefix/libexec [AC_DEFINE(PANEL_MATE, 1, [panel type])] , [test "x$panel" = xxfce4], [PKG_CHECK_MODULES(LIBPANEL, libxfce4panel-1.0 >= 4.6.0)] - LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=prefix libxfce4panel-1.0`/share/xfce4/panel-plugins - PLUGIN_DIR=`$PKG_CONFIG --variable=libdir libxfce4panel-1.0`/xfce4/panel/plugins -+ LIBPANEL_APPLET_DIR=${prefix}/share/xfce4/panel-plugins -+ PLUGIN_DIR=${prefix}/lib/xfce4/panel/plugins ++ LIBPANEL_APPLET_DIR=$prefix/share/xfce4/panel-plugins ++ PLUGIN_DIR=`$PKG_CONFIG --define-variable=prefix=$prefix --variable=libdir libxfce4panel-1.0`/xfce4/panel/plugins [AC_DEFINE(PANEL_XFCE4, 1, [panel type])] , - [AC_MSG_ERROR([Unknown panel type, use gnome2, gnome3, mate or xfce4])] + [AC_MSG_ERROR([Unknown panel type, use gnome2, gnome3, gnomeflashback, mate or xfce4])] diff --git a/pkgs/build-support/fetchdocker/credentials.nix b/pkgs/build-support/fetchdocker/credentials.nix index 001693501ccb0..6d084d3c77edb 100644 --- a/pkgs/build-support/fetchdocker/credentials.nix +++ b/pkgs/build-support/fetchdocker/credentials.nix @@ -32,7 +32,7 @@ let pathParts = (builtins.filter - ({prefix}: "DOCKER_CREDENTIALS" == prefix) + ({prefix, path}: "DOCKER_CREDENTIALS" == prefix) builtins.nixPath); in if (pathParts != []) then (builtins.head pathParts).path else "" diff --git a/pkgs/data/fonts/junicode/default.nix b/pkgs/data/fonts/junicode/default.nix index 8b1ddd0c7538d..824d9044d76fc 100644 --- a/pkgs/data/fonts/junicode/default.nix +++ b/pkgs/data/fonts/junicode/default.nix @@ -16,5 +16,6 @@ fetchzip { homepage = http://junicode.sourceforge.net/; description = "A Unicode font for medievalists"; platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/data/fonts/libertine/default.nix b/pkgs/data/fonts/libertine/default.nix index 91a7932c2caf1..748c0268a80f9 100644 --- a/pkgs/data/fonts/libertine/default.nix +++ b/pkgs/data/fonts/libertine/default.nix @@ -49,5 +49,6 @@ stdenv.mkDerivation rec { homepage = http://linuxlibertine.sf.net; platforms = platforms.linux; maintainers = [ maintainers.volth ]; + license = licenses.ofl; }; } diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index 5e658e458fd5e..3dc7bba981fc8 100644 --- a/pkgs/data/fonts/unifont/default.nix +++ b/pkgs/data/fonts/unifont/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { name = "unifont-${version}"; - version = "11.0.01"; + version = "11.0.02"; ttf = fetchurl { url = "mirror://gnu/unifont/${name}/${name}.ttf"; - sha256 = "03nnfnh4j60a4hy0d4hqpnvhlfx437hp4g1wjfjy91vzrcbmvkwi"; + sha256 = "0l8p07m566131xdinv1pcfc578jpvn72n6dhqmgivp8myai2xkzx"; }; pcf = fetchurl { url = "mirror://gnu/unifont/${name}/${name}.pcf.gz"; - sha256 = "03bqqz2ipy3afhwsfy30c2v97cc27grw11lc0vzcvrgvin9ys2v1"; + sha256 = "1hcl71fjchngcb2b4mwl4hhx886faaniv86x2xgk8850766qpnmy"; }; nativeBuildInputs = [ mkfontscale mkfontdir ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "1ncllq42x1mlblf6h44garc3b5hkxv9dkpgbaipzll22p1l29yrf"; + outputHash = "16ni07cfw38s7cj8bdsfi7fa1qahm3k90cmm4gn40qvz35i17x15"; meta = with stdenv.lib; { description = "Unicode font for Base Multilingual Plane"; diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 80f2c9ce70d78..c41183f4b24f3 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -8,12 +8,7 @@ let overridden = set // overrides; set = with overridden; { startupnotification = libstartup_notification; gnomedocutils = self.gnome-doc-utils; gnomeicontheme = self.gnome_icon_theme; - gnomepanel = self.gnome_panel; gnome_common = gnome-common; - gnome_keyring = gnome-keyring; - gnome_desktop = gnome-desktop; - gnome_settings_daemon = gnome-settings-daemon; - gnome_control_center = gnome-control-center; inherit rarian; #### PLATFORM @@ -58,8 +53,6 @@ let overridden = set // overrides; set = with overridden; { gnome_vfs = callPackage ./platform/gnome-vfs { }; - gnome_vfs_monikers = callPackage ./platform/gnome-vfs-monikers { }; - libgnome = callPackage ./platform/libgnome { }; libgnomeui = callPackage ./platform/libgnomeui { }; @@ -68,8 +61,6 @@ let overridden = set // overrides; set = with overridden; { libbonoboui = callPackage ./platform/libbonoboui { }; - at_spi = callPackage ./platform/at-spi { }; - gtkhtml = callPackage ./platform/gtkhtml { }; gtkhtml4 = callPackage ./platform/gtkhtml/4.x.nix { }; @@ -83,31 +74,11 @@ let overridden = set // overrides; set = with overridden; { #### DESKTOP - gnome-keyring = callPackage ./desktop/gnome-keyring { }; - - libgweather = callPackage ./desktop/libgweather { }; - gvfs = gvfs.override { gnome = self; }; - libgnomekbd = callPackage ./desktop/libgnomekbd { }; - # Removed from recent GNOME releases, but still required scrollkeeper = callPackage ./desktop/scrollkeeper { }; - zenity = callPackage ./desktop/zenity { }; - - metacity = callPackage ./desktop/metacity { }; - - gnome_menus = callPackage ./desktop/gnome-menus { }; - - gnome-desktop = callPackage ./desktop/gnome-desktop { }; - - gnome_panel = callPackage ./desktop/gnome-panel { }; - - gnome-settings-daemon = callPackage ./desktop/gnome-settings-daemon { }; - - gnome-control-center = callPackage ./desktop/gnome-control-center { }; - gtksourceview = callPackage ./desktop/gtksourceview { }; gnome_icon_theme = callPackage ./desktop/gnome-icon-theme { }; diff --git a/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix deleted file mode 100644 index b4d82e0cffbcc..0000000000000 --- a/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, dbus-glib, libxml2Python, libxslt, libxklavier, popt, which, python -, shared-mime-info, desktop-file-utils, libunique, libtool, bzip2 -, gtk, gnome-doc-utils, intltool, GConf, libglade, libgnomeui, libgnomekbd -, librsvg, gnome_menus, gnome-desktop, gnome_panel, metacity, gnome-settings-daemon -, libSM, docbook_xml_dtd_412 }: - -stdenv.mkDerivation { - name = "gnome-control-center-2.32.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-control-center/2.32/gnome-control-center-2.32.1.tar.bz2; - sha256 = "0rkyg6naidql0nv74608mlsr2lzjgnndnxnxv3s0hp4f6mbqnmkw"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ dbus-glib libxml2Python libxslt libxklavier popt which python shared-mime-info desktop-file-utils - gtk gnome-doc-utils intltool GConf libglade libgnomekbd libunique libtool bzip2 - libgnomeui librsvg gnome_menus gnome-desktop gnome_panel metacity gnome-settings-daemon - libSM docbook_xml_dtd_412 - ]; - configureFlags = [ "--disable-scrollkeeper" ]; -} diff --git a/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix deleted file mode 100644 index d3d3649988659..0000000000000 --- a/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, python, libxml2Python, libxslt, which, libX11, gtk -, intltool, GConf, gnome-doc-utils}: - -stdenv.mkDerivation { - name = "gnome-desktop-2.32.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-desktop/2.32/gnome-desktop-2.32.1.tar.bz2; - sha256 = "17bkng6ay37n3492lr9wpb49kms6gh554rn9gbjs27zygvvfrjsm"; - }; - - configureFlags = [ "--disable-scrollkeeper" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ python libxml2Python libxslt which libX11 gtk - intltool GConf gnome-doc-utils ]; -} diff --git a/pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix deleted file mode 100644 index 26f3f624a042b..0000000000000 --- a/pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, -gtk, intltool, GConf, libgnome-keyring }: - -stdenv.mkDerivation { - name = "gnome-keyring-2.30.3"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-keyring/2.30/gnome-keyring-2.30.3.tar.bz2; - sha256 = "02r9gv3a4a705jf3h7c0bizn33c73wz0iw2500m7z291nrnmqkmj"; - }; - - buildInputs = [ dbus libgcrypt pam python gtk GConf libgnome-keyring ]; - - propagatedBuildInputs = [ glib libtasn1 ]; - - nativeBuildInputs = [ pkgconfig intltool ]; -} diff --git a/pkgs/desktops/gnome-2/desktop/gnome-menus/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-menus/default.nix deleted file mode 100644 index 0dcb409e0aae2..0000000000000 --- a/pkgs/desktops/gnome-2/desktop/gnome-menus/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{stdenv, fetchurl, pkgconfig, python, glib, intltool}: - -stdenv.mkDerivation { - name = "gnome-menus-2.30.5"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-menus/2.30/gnome-menus-2.30.5.tar.bz2; - sha256 = "1ajckii51spmkgfc0168c56x0syz5vwb2fp8b81c5s6n0r85dk3d"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ python glib intltool ]; -} diff --git a/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix deleted file mode 100644 index 3bef218740cbe..0000000000000 --- a/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, dbus-glib, popt, which, libxml2Python, libxslt, bzip2, python -, gtk, libXau, libcanberra-gtk2 -, intltool, ORBit2, libglade, libgnome, libgnomeui, libbonobo, libbonoboui, GConf, gnome_menus, gnome-desktop -, libwnck, librsvg, libgweather, gnome-doc-utils, libtasn1, libtool, xorg }: - -stdenv.mkDerivation { - name = "gnome-panel-2.32.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-panel/2.32/gnome-panel-2.32.1.tar.bz2; - sha256 = "0pyakxyixmcp1yhi8r1q6adhamh2waj48y397fkigj11gbmjhy4g"; - }; - - buildInputs = - [ gtk dbus-glib popt libxml2Python libxslt bzip2 python libXau intltool - ORBit2 libglade libgnome libgnomeui libbonobo libbonoboui GConf - gnome_menus gnome-desktop libwnck librsvg libgweather gnome-doc-utils - libtasn1 libtool libcanberra-gtk2 xorg.libICE xorg.libSM - ]; - - nativeBuildInputs = [ pkgconfig intltool which ]; - - configureFlags = [ "--disable-scrollkeeper" "--disable-introspection"/*not useful AFAIK*/ ]; - - NIX_CFLAGS_COMPILE="-I${GConf.dev}/include/gconf/2"; -} diff --git a/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix deleted file mode 100644 index 9712ce64841f0..0000000000000 --- a/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, dbus-glib, libxklavier, gtk -, intltool, GConf, gnome-desktop, libglade, libgnomekbd, polkit, libpulseaudio -, libSM }: - -stdenv.mkDerivation { - name = "gnome-settings-daemon-2.32.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-settings-daemon/2.32/gnome-settings-daemon-2.32.1.tar.bz2; - sha256 = "11jyn10w2p2a76pjrkd0pjl1w406df821p053awklvmdqgzb6x00"; - }; - - buildInputs = - [ dbus-glib libxklavier gtk GConf gnome-desktop libglade libgnomekbd polkit - libpulseaudio libSM - ]; - - nativeBuildInputs = [ pkgconfig intltool ]; -} diff --git a/pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix b/pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix deleted file mode 100644 index b846ef888c43f..0000000000000 --- a/pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{stdenv, fetchurl, pkgconfig, dbus-glib, libxklavier, glib, gtk, intltool, GConf, libglade}: - -stdenv.mkDerivation { - name = "libgnomekbd-2.32.0"; - - src = fetchurl { - url = mirror://gnome/sources/libgnomekbd/2.32/libgnomekbd-2.32.0.tar.bz2; - sha256 = "0mnjhdryx94c106fghzz01dyc1vlp16wn6sajvpxffnqqx62rmfx"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ dbus-glib libxklavier glib gtk intltool GConf libglade ]; -} diff --git a/pkgs/desktops/gnome-2/desktop/libgweather/default.nix b/pkgs/desktops/gnome-2/desktop/libgweather/default.nix deleted file mode 100644 index b358c31267478..0000000000000 --- a/pkgs/desktops/gnome-2/desktop/libgweather/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, GConf, libsoup, libtasn1, nettle, gmp }: - -assert stdenv ? glibc; - -stdenv.mkDerivation rec { - name = "libgweather-2.30.3"; - src = fetchurl { - url = "mirror://gnome/sources/libgweather/2.30/${name}.tar.bz2"; - sha256 = "0k16lpdyy8as8wgc5dqpy5b8i9i4mrl77qx8db23fgs2c533fddq"; - }; - configureFlags = [ "--with-zoneinfo-dir=${stdenv.glibc}/share/zoneinfo" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libxml2 gtk intltool GConf libsoup libtasn1 nettle gmp ]; -} diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix index c14ee25981c77..1547c364b5102 100644 --- a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix +++ b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib dbus-glib gmime libnotify libgnome-keyring openssl cyrus_sasl gnonlin sylpheed gob2 gettext intltool gnome2.GConf gnome2.libgnomeui dbus-glib gmime libnotify gnome2.gnome-keyring gnome2.scrollkeeper libxml2 gnome2.gnome_icon_theme hicolor-icon-theme tango-icon-theme ]; + buildInputs = [ glib dbus-glib gmime libnotify libgnome-keyring openssl cyrus_sasl gnonlin sylpheed gob2 gettext intltool gnome2.GConf gnome2.libgnomeui dbus-glib gmime libnotify gnome2.scrollkeeper libxml2 gnome2.gnome_icon_theme hicolor-icon-theme tango-icon-theme ]; prePatch = '' sed -i -e '/jb_rule_set_install_message/d' -e '/jb_rule_add_install_command/d' jbsrc/jb.c diff --git a/pkgs/desktops/gnome-2/desktop/metacity/default.nix b/pkgs/desktops/gnome-2/desktop/metacity/default.nix deleted file mode 100644 index 95dd97568f464..0000000000000 --- a/pkgs/desktops/gnome-2/desktop/metacity/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk, libXcomposite, libXcursor, libXdamage -, libcanberra-gtk2, intltool, GConf, startup_notification, zenity, gnome-doc-utils -, gsettings-desktop-schemas }: - -stdenv.mkDerivation { - name = "metacity-2.30.3"; - - src = fetchurl { - url = mirror://gnome/sources/metacity/2.30/metacity-2.30.3.tar.bz2; - sha256 = "1p8qzj967mmlwdl6gv9vb2vzs19czvivl0sd337lgr55iw0qgy08"; - }; - - buildInputs = - [ pkgconfig glib gtk libXcomposite libXcursor libXdamage libcanberra-gtk2 - intltool GConf startup_notification zenity gnome-doc-utils - gsettings-desktop-schemas - ]; -} diff --git a/pkgs/desktops/gnome-2/desktop/zenity/default.nix b/pkgs/desktops/gnome-2/desktop/zenity/default.nix deleted file mode 100644 index 5eb0068e2cdfd..0000000000000 --- a/pkgs/desktops/gnome-2/desktop/zenity/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, libxslt, gtk -, gnome-doc-utils, intltool, libglade, libX11, which, docbook_xml_dtd_412 }: - -stdenv.mkDerivation { - name = "zenity-2.32.1"; - - src = fetchurl { - url = mirror://gnome/sources/zenity/2.32/zenity-2.32.1.tar.bz2; - sha256 = "1b0qxb07wif0ds1pl8xk3fq9p874j89rf718lii4ndh7382bwf48"; - }; - - configureFlags = [ "--disable-scrollkeeper" ]; - buildInputs = [ gtk libglade libxml2 libxslt libX11 docbook_xml_dtd_412 ]; - - nativeBuildInputs = [ pkgconfig intltool gnome-doc-utils which ]; - - doCheck = false; # fails, tries to access the net -} diff --git a/pkgs/desktops/gnome-2/platform/at-spi/default.nix b/pkgs/desktops/gnome-2/platform/at-spi/default.nix deleted file mode 100644 index 9bcc9ab6cabe5..0000000000000 --- a/pkgs/desktops/gnome-2/platform/at-spi/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, python, pkgconfig, popt, atk, gtk, libX11, libICE, libXtst, libXi -, intltool, libbonobo, ORBit2, GConf, dbus-glib }: - -stdenv.mkDerivation { - name = "at-spi-1.32.0"; - - src = fetchurl { - url = mirror://gnome/sources/at-spi/1.32/at-spi-1.32.0.tar.bz2; - sha256 = "0fbh0afzw1gm4r2w68b8l0vhnia1qyzdl407vyxfw4v4fkm1v16c"; - }; - - hardeningDisable = [ "format" ]; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ python popt atk gtk libX11 libICE libXtst libXi - intltool libbonobo ORBit2 GConf dbus-glib ]; -} diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix deleted file mode 100644 index 5ae126df331c2..0000000000000 --- a/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{stdenv, fetchurl, pkgconfig, glib, intltool, gnome_vfs, libbonobo}: - -stdenv.mkDerivation { - name = "gnome-vfs-monikers-2.15.3"; - src = fetchurl { - url = mirror://gnome/sources/gnome-vfs-monikers/2.15/gnome-vfs-monikers-2.15.3.tar.bz2; - sha256 = "0gpgk5vwhgqfhrd8pf1314kh7sv3jfqll2xbdbrs5s5sxy3v7b15"; - }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib intltool gnome_vfs libbonobo ]; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index 13f4b1ef6389f..e909a356866c9 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -1,27 +1,26 @@ { stdenv, fetchurl, pkgconfig, libxslt, which, libX11, gnome3, gtk3, glib -, intltool, gnome-doc-utils, xkeyboard_config, isocodes, itstool, wayland -, libseccomp, bubblewrap, gobjectIntrospection }: +, intltool, libxml2, xkeyboard_config, isocodes, itstool, wayland +, libseccomp, bubblewrap, gobjectIntrospection, gtk-doc, docbook_xsl }: stdenv.mkDerivation rec { name = "gnome-desktop-${version}"; version = "3.28.2"; + outputs = [ "out" "dev" "devdoc" ]; + src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "0c439hhpfd9axmv4af6fzhibksh69pnn2nnbghbbqqbwy6zqfl30"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-desktop"; attrPath = "gnome3.gnome-desktop"; }; - }; - - # this should probably be setuphook for glib + # TODO: remove with 3.30 NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; enableParallelBuilding = true; nativeBuildInputs = [ - pkgconfig which itstool intltool libxslt gnome-doc-utils gobjectIntrospection + pkgconfig which itstool intltool libxslt libxml2 gobjectIntrospection + gtk-doc docbook_xsl ]; buildInputs = [ libX11 bubblewrap xkeyboard_config isocodes wayland @@ -34,11 +33,22 @@ stdenv.mkDerivation rec { ./bubblewrap-paths.patch ]; + configureFlags = [ + "--enable-gtk-doc" + ]; + postPatch = '' substituteInPlace libgnome-desktop/gnome-desktop-thumbnail-script.c --subst-var-by \ BUBBLEWRAP_BIN "${bubblewrap}/bin/bwrap" ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-desktop"; + attrPath = "gnome3.gnome-desktop"; + }; + }; + meta = with stdenv.lib; { description = "Library with common API for various GNOME modules"; license = with licenses; [ gpl2 lgpl2 ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix index d224f05617039..a0318514c9b9c 100644 --- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, gnome3 -, gnome-doc-utils, intltool, which, libuuid, vala -, desktop-file-utils, itstool, wrapGAppsHook, appdata-tools }: +{ stdenv, fetchurl, pkgconfig, libxml2, gnome3, dconf, nautilus +, gtk, gsettings-desktop-schemas, vte, intltool, which, libuuid, vala +, desktop-file-utils, itstool, wrapGAppsHook }: stdenv.mkDerivation rec { name = "gnome-terminal-${version}"; @@ -11,15 +11,16 @@ stdenv.mkDerivation rec { sha256 = "0ybjansg6lr279191w8z8r45gy4rxwzw1ajm98cgkv0fk2jdr0x2"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-terminal"; attrPath = "gnome3.gnome-terminal"; }; - }; - - buildInputs = [ gnome3.gtk gnome3.gsettings-desktop-schemas gnome3.vte appdata-tools - gnome3.dconf itstool gnome3.nautilus ]; + buildInputs = [ + gtk gsettings-desktop-schemas vte libuuid dconf + # For extension + nautilus + ]; - nativeBuildInputs = [ pkgconfig intltool gnome-doc-utils which libuuid libxml2 - vala desktop-file-utils wrapGAppsHook ]; + nativeBuildInputs = [ + pkgconfig intltool itstool which libxml2 + vala desktop-file-utils wrapGAppsHook + ]; # Silly ./configure, it looks for dbus file from gnome-shell in the # installation tree of the package it is configuring. @@ -28,15 +29,22 @@ stdenv.mkDerivation rec { substituteInPlace src/Makefile.in --replace '$(dbusinterfacedir)/org.gnome.ShellSearchProvider2.xml' "${gnome3.gnome-shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" ''; - # FIXME: enable for gnome3 - configureFlags = [ "--disable-migration" ]; + configureFlags = [ "--disable-migration" ]; # TODO: remove this with 3.30 + + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-terminal"; + attrPath = "gnome3.gnome-terminal"; + }; + }; enableParallelBuilding = true; meta = with stdenv.lib; { description = "The GNOME Terminal Emulator"; - homepage = https://wiki.gnome.org/Apps/Terminal/; + homepage = https://wiki.gnome.org/Apps/Terminal; platforms = platforms.linux; + license = licenses.gpl3Plus; maintainers = gnome3.maintainers; }; } diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix index 861702a3986e4..797eb00bd3ffe 100644 --- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix @@ -1,6 +1,7 @@ -{ stdenv, intltool, fetchFromGitLab, pkgconfig, gtk3, defaultIconTheme -, glib, desktop-file-utils, appdata-tools, gtk-doc, autoconf, automake, libtool -, wrapGAppsHook, gnome3, itstool, libxml2 +{ stdenv, intltool, fetchFromGitLab, fetchpatch, pkgconfig, gtk3, defaultIconTheme +, glib, desktop-file-utils, gtk-doc, autoconf, automake, libtool +, wrapGAppsHook, gnome3, itstool, libxml2, yelp-tools +, docbook_xsl, docbook_xml_dtd_412, gsettings-desktop-schemas , callPackage, unzip, gobjectIntrospection }: let @@ -9,6 +10,8 @@ in stdenv.mkDerivation rec { name = "gucharmap-${version}"; version = "11.0.1"; + outputs = [ "out" "lib" "dev" "devdoc" ]; + src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; @@ -17,16 +20,26 @@ in stdenv.mkDerivation rec { sha256 = "13iw4fa6mv8vi8bkwk0bbhamnzbaih0c93p4rh07khq6mxa6hnpi"; }; + patches = [ + # Fix locale path to allow split outputs + # https://gitlab.gnome.org/GNOME/gucharmap/issues/10 + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/gucharmap/commit/b2b03f16aa869ac0ec1a05c55c4d4e4c4b513576.patch; + sha256 = "1543mcyz96x23m9pzx04ny15m4a2pqmiksl1y5r51k3sw4fyisci"; + }) + ]; + nativeBuildInputs = [ - pkgconfig wrapGAppsHook unzip intltool itstool appdata-tools - autoconf automake libtool gtk-doc - gnome3.yelp-tools libxml2 desktop-file-utils gobjectIntrospection + pkgconfig wrapGAppsHook unzip intltool itstool + autoconf automake libtool gtk-doc docbook_xsl docbook_xml_dtd_412 + yelp-tools libxml2 desktop-file-utils gobjectIntrospection ]; - buildInputs = [ gtk3 glib gnome3.gsettings-desktop-schemas defaultIconTheme ]; + buildInputs = [ gtk3 glib gsettings-desktop-schemas defaultIconTheme ]; configureFlags = [ "--with-unicode-data=${unicode-data}" + "--enable-gtk-doc" ]; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/vte/default.nix b/pkgs/desktops/gnome-3/core/vte/default.nix index 17385ab720295..47a2c2f19d3bf 100644 --- a/pkgs/desktops/gnome-3/core/vte/default.nix +++ b/pkgs/desktops/gnome-3/core/vte/default.nix @@ -19,7 +19,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gobjectIntrospection intltool pkgconfig vala gperf libxml2 ]; buildInputs = [ gnome3.glib gnome3.gtk3 ncurses ]; - propagatedBuildInputs = [ gnutls pcre2 ]; + propagatedBuildInputs = [ + # Required by vte-2.91.pc. + gnome3.gtk3 + gnutls + pcre2 + ]; preConfigure = "patchShebangs ."; diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index ce542e7f88b6b..478dfc5d9f419 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -187,31 +187,31 @@ lib.makeScope pkgs.newScope (self: with self; { nautilus = callPackage ./core/nautilus { }; networkmanager-openvpn = pkgs.networkmanager-openvpn.override { - inherit gnome3; + withGnome = true; }; networkmanager-vpnc = pkgs.networkmanager-vpnc.override { - inherit gnome3; + withGnome = true; }; networkmanager-openconnect = pkgs.networkmanager-openconnect.override { - inherit gnome3; + withGnome = true; }; networkmanager-fortisslvpn = pkgs.networkmanager-fortisslvpn.override { - inherit gnome3; + withGnome = true; }; networkmanager-l2tp = pkgs.networkmanager-l2tp.override { - inherit gnome3; + withGnome = true; }; networkmanager-iodine = pkgs.networkmanager-iodine.override { - inherit gnome3; + withGnome = true; }; networkmanagerapplet = pkgs.networkmanagerapplet.override { - inherit gnome3 gsettings-desktop-schemas glib-networking; + withGnome = true; }; rest = callPackage ./core/rest { }; @@ -373,10 +373,18 @@ lib.makeScope pkgs.newScope (self: with self; { gexiv2 = callPackage ./misc/gexiv2 { }; + gnome-applets = callPackage ./misc/gnome-applets { }; + + gnome-flashback = callPackage ./misc/gnome-flashback { }; + + gnome-panel = callPackage ./misc/gnome-panel { }; + gnome-tweaks = callPackage ./misc/gnome-tweaks { }; gpaste = callPackage ./misc/gpaste { }; + metacity = callPackage ./misc/metacity { }; + pidgin-im-gnome-shell-extension = callPackage ./misc/pidgin { }; gtkhtml = callPackage ./misc/gtkhtml { }; diff --git a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix new file mode 100644 index 0000000000000..cbf8bc9707bf2 --- /dev/null +++ b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix @@ -0,0 +1,110 @@ +{ stdenv +, fetchurl +, fetchpatch +, autoreconfHook +, intltool +, itstool +, libxml2 +, libxslt +, pkgconfig +, gnome-panel +, gtk3 +, glib +, libwnck3 +, libgtop +, libnotify +, upower +, dbus-glib +, wirelesstools +, linuxPackages +, adwaita-icon-theme +, libgweather +, gucharmap +, gnome-settings-daemon +, tracker +, polkit +, gnome3 +}: + +let + pname = "gnome-applets"; + version = "3.28.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + sha256 = "0wd6pirv57rcxm5d32r1s3ni7sp26gnqd4qhjciw0pn5ak627y5h"; + }; + + patches = [ + # https://github.com/NixOS/nixpkgs/issues/36468 + # https://gitlab.gnome.org/GNOME/gnome-applets/issues/3 + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/gnome-applets/commit/1ee719581c33d7d640ae9f656e4e9b192bafef78.patch; + sha256 = "05wim7d2ii3pxph3n3am76cvnxmkfpggk0cpy8p5xgm3hcibwfrf"; + }) + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/gnome-applets/commit/1fa778b01f0e6b70678b0e5755ca0ed7a093fa75.patch; + sha256 = "0kppqywn0ab18p64ixz0b58cn5bpqf0xy71bycldlc5ybpdx5mq0"; + }) + + # https://gitlab.gnome.org/GNOME/gnome-applets/issues/4 + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/gnome-applets/commit/e14482a90e6113f211e9328d8c39a69bdf5111d8.patch; + sha256 = "10ac0kk38hxqh8yvdlriyyv809qrxbpy9ihp01gizhiw7qpz97ff"; + }) + ]; + + nativeBuildInputs = [ + autoreconfHook + intltool + itstool + pkgconfig + libxml2 + libxslt + ]; + + buildInputs = [ + gnome-panel + gtk3 + glib + libxml2 + libwnck3 + libgtop + libnotify + upower + dbus-glib + adwaita-icon-theme + libgweather + gucharmap + gnome-settings-daemon + tracker + polkit + wirelesstools + linuxPackages.cpupower + ]; + + enableParallelBuilding = true; + + doCheck = true; + + configureFlags = [ + "--with-libpanel-applet-dir=$(out)/share/gnome-panel/applets" + ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + + meta = with stdenv.lib; { + description = "Applets for use with the GNOME panel"; + homepage = https://wiki.gnome.org/Projects/GnomeApplets; + license = licenses.gpl2Plus; + maintainers = gnome3.maintainers; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix new file mode 100644 index 0000000000000..f3f2cf9925716 --- /dev/null +++ b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix @@ -0,0 +1,92 @@ +{ stdenv +, autoreconfHook +, fetchurl +, fetchpatch +, gettext +, glib +, gnome-bluetooth +, gnome-desktop +, gnome-session +, gnome3 +, gsettings-desktop-schemas +, gtk +, ibus +, intltool +, libcanberra-gtk3 +, libpulseaudio +, libxkbfile +, libxml2 +, metacity +, pkgconfig +, polkit +, substituteAll +, upower +, xkeyboard_config }: + +let + pname = "gnome-flashback"; + version = "3.28.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + sha256 = "1ra8bfwgwqw47zx2h1q999g7l4dnqh7sv02if3zk8pkw3sm769hg"; + }; + + patches =[ + (substituteAll { + src = ./fix-paths.patch; + inherit metacity; + gnomeSession = gnome-session; + }) + + # https://github.com/NixOS/nixpkgs/issues/36468 + # https://gitlab.gnome.org/GNOME/gnome-flashback/issues/3 + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/gnome-flashback/commit/eabd34f64adc43b8783920bd7a2177ce21f83fbc.patch; + sha256 = "116c5zy8cp7d06mrsn943q7vj166086jzrfzfqg7yli14pmf9w1a"; + }) + ]; + + nativeBuildInputs = [ + autoreconfHook + gettext + libxml2 + pkgconfig + ]; + + buildInputs = [ + glib + gnome-bluetooth + gnome-desktop + gsettings-desktop-schemas + gtk + ibus + libcanberra-gtk3 + libpulseaudio + libxkbfile + polkit + upower + xkeyboard_config + ]; + + doCheck = true; + + enableParallelBuilding = true; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + + meta = with stdenv.lib; { + description = "GNOME 2.x-like session for GNOME 3"; + homepage = https://wiki.gnome.org/Projects/GnomeFlashback; + license = licenses.gpl2; + maintainers = gnome3.maintainers; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/misc/gnome-flashback/fix-paths.patch b/pkgs/desktops/gnome-3/misc/gnome-flashback/fix-paths.patch new file mode 100644 index 0000000000000..9d5add233d614 --- /dev/null +++ b/pkgs/desktops/gnome-3/misc/gnome-flashback/fix-paths.patch @@ -0,0 +1,30 @@ +--- a/data/Makefile.am ++++ b/data/Makefile.am +@@ -22,7 +22,7 @@ + echo 'if [ -z $$XDG_CURRENT_DESKTOP ]; then' && \ + echo ' export XDG_CURRENT_DESKTOP="GNOME-Flashback:GNOME"' && \ + echo 'fi' && echo '' && \ +- echo 'exec gnome-session --session=gnome-flashback-compiz "$$@"') > $@ ++ echo 'exec @gnomeSession@/bin/gnome-session --session=gnome-flashback-compiz "$$@"') > $@ + $(AM_V_at) chmod a+x $@ + + gnome-flashback-metacity: Makefile +@@ -30,7 +30,7 @@ + echo 'if [ -z $$XDG_CURRENT_DESKTOP ]; then' && \ + echo ' export XDG_CURRENT_DESKTOP="GNOME-Flashback:GNOME"' && \ + echo 'fi' && echo '' && \ +- echo 'exec gnome-session --session=gnome-flashback-metacity --disable-acceleration-check "$$@"') > $@ ++ echo 'exec @gnomeSession@/bin/gnome-session --session=gnome-flashback-metacity --disable-acceleration-check "$$@"') > $@ + $(AM_V_at) chmod a+x $@ + + CLEANFILES = \ +--- a/data/xsessions/gnome-flashback-metacity.desktop.in.in ++++ b/data/xsessions/gnome-flashback-metacity.desktop.in.in +@@ -2,6 +2,6 @@ + Name=GNOME Flashback (Metacity) + Comment=This session logs you into GNOME Flashback with Metacity + Exec=@libexecdir@/gnome-flashback-metacity +-TryExec=metacity ++TryExec=@metacity@/bin/metacity + Type=Application + DesktopNames=GNOME-Flashback;GNOME; diff --git a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix new file mode 100644 index 0000000000000..5c40b4c8f441d --- /dev/null +++ b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix @@ -0,0 +1,92 @@ +{ stdenv +, fetchurl +, autoreconfHook +, fetchpatch +, dconf +, evolution-data-server +, gdm +, gettext +, glib +, gnome-desktop +, gnome-menus +, gnome3 +, gtk +, itstool +, libgweather +, libsoup +, libwnck3 +, libxml2 +, pkgconfig +, polkit +, systemd +, wrapGAppsHook }: + +let + pname = "gnome-panel"; + version = "3.28.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + outputs = [ "out" "dev" "man" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + sha256 = "1004cp9cxqpic9lsraqn5c1739acn4sn4ql3c1fja99hv22h1ziv"; + }; + + patches = [ + # https://github.com/NixOS/nixpkgs/issues/36468 + # https://gitlab.gnome.org/GNOME/gnome-panel/issues/6 + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/gnome-panel/commit/be26e170a10c297949a6d9f3cbc70b6caaf04b56.patch; + sha256 = "10gxl9fwbv5j0s1lz7gkz6wqpda5wfzs49r5khbk1h05lv0hk4l4"; + }) + ]; + + nativeBuildInputs = [ + autoreconfHook + gettext + itstool + libxml2 + pkgconfig + wrapGAppsHook + ]; + + buildInputs = [ + dconf + evolution-data-server + gdm + glib + gnome-desktop + gnome-menus + gtk + libgweather + libsoup + libwnck3 + polkit + systemd + ]; + + configureFlags = [ + "--enable-eds" + ]; + + enableParallelBuilding = true; + + doCheck = true; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + + meta = with stdenv.lib; { + description = "Component of Gnome Flashback that provides panels and default applets for the desktop"; + homepage = https://wiki.gnome.org/Projects/GnomePanel; + license = licenses.gpl2Plus; + maintainers = gnome3.maintainers; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/misc/metacity/default.nix b/pkgs/desktops/gnome-3/misc/metacity/default.nix new file mode 100644 index 0000000000000..46ff2c118137d --- /dev/null +++ b/pkgs/desktops/gnome-3/misc/metacity/default.nix @@ -0,0 +1,70 @@ +{ stdenv +, fetchurl +, gettext +, glib +, gnome3 +, gsettings-desktop-schemas +, gtk +, libcanberra-gtk3 +, libgtop +, libstartup_notification +, libxml2 +, pkgconfig +, substituteAll +, wrapGAppsHook +, zenity }: + +let + pname = "metacity"; + version = "3.28.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + sha256 = "0kzap0lzlkcgkna3h426xgwrn2zpipy8cfsxpfynnaf74vyas3aw"; + }; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + inherit zenity; + }) + ]; + + nativeBuildInputs = [ + gettext + libxml2 + pkgconfig + wrapGAppsHook + ]; + + buildInputs = [ + glib + gsettings-desktop-schemas + gtk + libcanberra-gtk3 + libgtop + libstartup_notification + zenity + ]; + + enableParallelBuilding = true; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Window manager used in Gnome Flashback"; + homepage = https://wiki.gnome.org/Projects/Metacity; + license = licenses.gpl2; + maintainers = gnome3.maintainers; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/misc/metacity/fix-paths.patch b/pkgs/desktops/gnome-3/misc/metacity/fix-paths.patch new file mode 100644 index 0000000000000..ff3a244e67d97 --- /dev/null +++ b/pkgs/desktops/gnome-3/misc/metacity/fix-paths.patch @@ -0,0 +1,11 @@ +--- a/src/core/util.c ++++ b/src/core/util.c +@@ -424,7 +424,7 @@ + g_slist_length (columns)*2 + + g_slist_length (entries))); + +- argvl[i++] = "zenity"; ++ argvl[i++] = "@zenity@/bin/zenity"; + argvl[i++] = type; + argvl[i++] = "--display"; + argvl[i++] = display; diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix index efc9a3d2c39ff..11f71d109377b 100644 --- a/pkgs/desktops/mate/mate-media/default.nix +++ b/pkgs/desktops/mate/mate-media/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-media-${version}"; - version = "1.20.1"; + version = "1.21.0"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "1db47m80qfb1xyrg1qxwvmkc53qp97yhvh86fgwjv00x96c3j9s9"; + sha256 = "0mgx4xjarpyvyaw0p0jnh74447y6zd93fvpi12078vyqr25dsi43"; }; buildInputs = [ diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index 9e5faf96de294..acf769f02e335 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.13.2/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.13.4/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch index 7f45d51d16098..9027f6ad8a4a4 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch +++ b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch @@ -526,7 +526,7 @@ index f9e2e429..0a4267a9 100644 echo 'startkde: Done.' 1>&2 diff --git a/startkde/startplasma.cmake b/startkde/startplasma.cmake -index a5d09fa7..d42c284b 100644 +index f7330ab3..5eedbb11 100644 --- a/startkde/startplasma.cmake +++ b/startkde/startplasma.cmake @@ -1,6 +1,6 @@ @@ -663,8 +663,8 @@ index a5d09fa7..d42c284b 100644 exit 1 fi --qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit -+@NIXPKGS_QDBUS@ org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit +-qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit & ++@NIXPKGS_QDBUS@ org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit & # finally, give the session control to the session manager # see kdebase/ksmserver for the description of the rest of the startup sequence @@ -718,7 +718,7 @@ index a5d09fa7..d42c284b 100644 echo 'startplasma: Done.' 1>&2 diff --git a/startkde/startplasmacompositor.cmake b/startkde/startplasmacompositor.cmake -index dd9e304d..49d456e9 100644 +index dd9e304d..12132f9e 100644 --- a/startkde/startplasmacompositor.cmake +++ b/startkde/startplasmacompositor.cmake @@ -1,118 +1,165 @@ diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index 966237b73a82e..752493b1a70d4 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -3,363 +3,363 @@ { bluedevil = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/bluedevil-5.13.2.tar.xz"; - sha256 = "16ip2myq0s5d1yjipr0k0cvbq22mc668pms33qhs2836mqxq4c87"; - name = "bluedevil-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/bluedevil-5.13.4.tar.xz"; + sha256 = "1f7bjj3p5n8pvmqqgqz5xgjjhq1mjwknd36hrr5jn3klhbyahqkk"; + name = "bluedevil-5.13.4.tar.xz"; }; }; breeze = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/breeze-5.13.2.tar.xz"; - sha256 = "1yl41rjh2qmplny6x9hm885mwsfn6w5asw8dkp7rk0qpyb607jkq"; - name = "breeze-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/breeze-5.13.4.tar.xz"; + sha256 = "1kxcd8zkk79mjh1j0lzw2nf0v0w2qc4zzb68nw61k1ca8v9mgq84"; + name = "breeze-5.13.4.tar.xz"; }; }; breeze-grub = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/breeze-grub-5.13.2.tar.xz"; - sha256 = "1j2lh8prbdivy7vlv3iyizgkmsc2qwpjkivyn9b9r6gpp0ii0dwk"; - name = "breeze-grub-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/breeze-grub-5.13.4.tar.xz"; + sha256 = "1vxy24b2ndjkljw5ipwl8nl8nqckxr64sq6v4p690wib9j1nly09"; + name = "breeze-grub-5.13.4.tar.xz"; }; }; breeze-gtk = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/breeze-gtk-5.13.2.tar.xz"; - sha256 = "12hs3nqjf20kcn18ab64qdwc8aq33l220giqfffdb7rh8n7wyknx"; - name = "breeze-gtk-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/breeze-gtk-5.13.4.tar.xz"; + sha256 = "0sa0v9irimqhh17c1nykzkbhr6n3agam8y0idfr26xg7jblch3s0"; + name = "breeze-gtk-5.13.4.tar.xz"; }; }; breeze-plymouth = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/breeze-plymouth-5.13.2.tar.xz"; - sha256 = "18020rppw59iwqdrmm0xsmq2cl98z6m5na8walvvzvlqsskc7hh6"; - name = "breeze-plymouth-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/breeze-plymouth-5.13.4.tar.xz"; + sha256 = "1v02bh3xwcx5vixcp21a4wq04nn3wsgip5ycrgsb2bn013mspv20"; + name = "breeze-plymouth-5.13.4.tar.xz"; }; }; discover = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/discover-5.13.2.tar.xz"; - sha256 = "0jh2d9gk72fm2csf8i41hq4i0dd467m3cw5y81wbrz3k9qd3llrb"; - name = "discover-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/discover-5.13.4.tar.xz"; + sha256 = "1n7wd9w1r9a5ncgqc2s0aywivzqc3115wr93hrf1lqxpk0qskkyc"; + name = "discover-5.13.4.tar.xz"; }; }; drkonqi = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/drkonqi-5.13.2.tar.xz"; - sha256 = "1zfd4pbrqp67zqmhydimqdbq49bc5b20d9z8px27l1rgj951ms2j"; - name = "drkonqi-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/drkonqi-5.13.4.tar.xz"; + sha256 = "1ddqisah98qd0hqg6pz5jk1pmisji2c6mj3i5w7df57zi7kpj4wz"; + name = "drkonqi-5.13.4.tar.xz"; }; }; kactivitymanagerd = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/kactivitymanagerd-5.13.2.tar.xz"; - sha256 = "1z6nncnlzmk0l1k4vsg9g2z18k1z4k73j2gv7bbhyx9xmb0aypdf"; - name = "kactivitymanagerd-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/kactivitymanagerd-5.13.4.tar.xz"; + sha256 = "0iq5bxnszdndbvrqi8xm80d7i67xw0z45yq3qdsdlx80zzgb9g9d"; + name = "kactivitymanagerd-5.13.4.tar.xz"; }; }; kde-cli-tools = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/kde-cli-tools-5.13.2.tar.xz"; - sha256 = "04hyhbr288girwsp5h8rbxkp8m56wm69h9vhbb7g4lr5b3jrr1ps"; - name = "kde-cli-tools-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/kde-cli-tools-5.13.4.tar.xz"; + sha256 = "1dznj0jni4bm5z0hy644pcf7iavfd9yp8hfx87af3xhxxrifws37"; + name = "kde-cli-tools-5.13.4.tar.xz"; }; }; kdecoration = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/kdecoration-5.13.2.tar.xz"; - sha256 = "1gjp1ma0d0kxkky13kx16gwmwwjllz2w9h4ffa9hnw93sk0z1rb0"; - name = "kdecoration-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/kdecoration-5.13.4.tar.xz"; + sha256 = "1clf939g7qpnxxxw8iv3i4l9330dayzhg0cfrx6mffm2ywny67wd"; + name = "kdecoration-5.13.4.tar.xz"; }; }; kde-gtk-config = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/kde-gtk-config-5.13.2.tar.xz"; - sha256 = "0np7r02ihgii1894fysr8ik9jxs3b6bdb5blkdnh51j44dr7c5a4"; - name = "kde-gtk-config-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/kde-gtk-config-5.13.4.tar.xz"; + sha256 = "03x5yvgk6kjy12qh3xblv90rsf8g5nsrc9573zd3rzz74pjql605"; + name = "kde-gtk-config-5.13.4.tar.xz"; }; }; kdeplasma-addons = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/kdeplasma-addons-5.13.2.tar.xz"; - sha256 = "03a0w3gimiak32zhhqwi4y35lpdq7fblbjg8xfgsdzrps7zh1n7x"; - name = "kdeplasma-addons-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/kdeplasma-addons-5.13.4.tar.xz"; + sha256 = "1kgnmkykma14vinabal747hpvnrahccksgb68pxb4lxgylbcvy04"; + name = "kdeplasma-addons-5.13.4.tar.xz"; }; }; kgamma5 = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/kgamma5-5.13.2.tar.xz"; - sha256 = "0d3yhwgyag5yzny9adsxvdd1dmfq0k6aslz9cgi5fn7k9jppvn6j"; - name = "kgamma5-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/kgamma5-5.13.4.tar.xz"; + sha256 = "0hcnflk7zzpx00w6ifidrwxjmr99xrisfz2206fggal5j7y5w6yw"; + name = "kgamma5-5.13.4.tar.xz"; }; }; khotkeys = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/khotkeys-5.13.2.tar.xz"; - sha256 = "13fffa73mddm4wb436kw6m7i2p1mv8c3z8dj6gr7ccbcsmzhlj88"; - name = "khotkeys-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/khotkeys-5.13.4.tar.xz"; + sha256 = "1nq2afb06y3383gh3n5b1b4sbry5nicy3znid6p7b0jch1a0v73x"; + name = "khotkeys-5.13.4.tar.xz"; }; }; kinfocenter = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/kinfocenter-5.13.2.tar.xz"; - sha256 = "00cvc3idbghl74nbrbii9xp969vngr0jbdsjh1rriv1is8vfldfn"; - name = "kinfocenter-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/kinfocenter-5.13.4.tar.xz"; + sha256 = "1vnch4ic1ppsrnp1w6rjcmn3c9ni91b3dgk0z91aw2x8c77cvji9"; + name = "kinfocenter-5.13.4.tar.xz"; }; }; kmenuedit = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/kmenuedit-5.13.2.tar.xz"; - sha256 = "0ss2dwnaqsfir0s95iyp1sjmh1kx19jihj1nbnix5hdlwgbp5qvd"; - name = "kmenuedit-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/kmenuedit-5.13.4.tar.xz"; + sha256 = "0jyb4dc42dnpb6v4hkfb9m97yim767z0dc0i0hxqvznd87n5nk98"; + name = "kmenuedit-5.13.4.tar.xz"; }; }; kscreen = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/kscreen-5.13.2.tar.xz"; - sha256 = "080m1kii0xxd2r1b2gvz40qj7ixkammgb3ki3sbxa74avwxd1p10"; - name = "kscreen-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/kscreen-5.13.4.tar.xz"; + sha256 = "0labhlwdar6iibixal48bkk777hpyaibszv9mshlmhd7riaqrxs3"; + name = "kscreen-5.13.4.tar.xz"; }; }; kscreenlocker = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/kscreenlocker-5.13.2.tar.xz"; - sha256 = "0hczdgx03i2r6y8qfrpj7pk4n5l1maigsip77qbgsli3d3fapri9"; - name = "kscreenlocker-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/kscreenlocker-5.13.4.tar.xz"; + sha256 = "01b6y0wwclhni6ansg3avkml4qsq93rrg254ihy18bd1h05jxg4r"; + name = "kscreenlocker-5.13.4.tar.xz"; }; }; ksshaskpass = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/ksshaskpass-5.13.2.tar.xz"; - sha256 = "1f4b12vqzg351m4ps316w0spbywm7mv21p95sd17zz17fm39pzzn"; - name = "ksshaskpass-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/ksshaskpass-5.13.4.tar.xz"; + sha256 = "1f1567ac8qlgjgbqbksxqm969shydw3nizhn3ixvzr0n81lvab36"; + name = "ksshaskpass-5.13.4.tar.xz"; }; }; ksysguard = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/ksysguard-5.13.2.tar.xz"; - sha256 = "0b4achg5dvb97mf25bd9s08nanj4ag6y4bwdbpr3zgbp1dp790n7"; - name = "ksysguard-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/ksysguard-5.13.4.tar.xz"; + sha256 = "1pg5687mlf5h4wb65my0v6scrj1zkxm5755wlq1jdasqr6zffdw0"; + name = "ksysguard-5.13.4.tar.xz"; }; }; kwallet-pam = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/kwallet-pam-5.13.2.tar.xz"; - sha256 = "1dpd7lgycfjrd9lgv1na4gb3wf22dvprigsxsqiq3zw9xqkc9778"; - name = "kwallet-pam-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/kwallet-pam-5.13.4.tar.xz"; + sha256 = "0f9pg73710adr8p7m9qmync2lc86yl6hxmvr854lqzrp9mm2an0p"; + name = "kwallet-pam-5.13.4.tar.xz"; }; }; kwayland-integration = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/kwayland-integration-5.13.2.tar.xz"; - sha256 = "0bhx5678f21mxmrdlh6r8cxjj6dh45minkgarh6j2zdvzfxxif1s"; - name = "kwayland-integration-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/kwayland-integration-5.13.4.tar.xz"; + sha256 = "0mhsidzpv5wg59d3v5z3a4n27fgfpdcr6y33zvib9k67isgx39h1"; + name = "kwayland-integration-5.13.4.tar.xz"; }; }; kwin = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/kwin-5.13.2.tar.xz"; - sha256 = "03fhjl3zyk725xp6bj6ljgfmniw5zgwpacarfl7ifnnwzgfbni6f"; - name = "kwin-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/kwin-5.13.4.tar.xz"; + sha256 = "1inh20xh80nv1vn0154jqsn6cn1xqfgjvvdvng6k2v330sd15dc6"; + name = "kwin-5.13.4.tar.xz"; }; }; kwrited = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/kwrited-5.13.2.tar.xz"; - sha256 = "0m6ks0l9nyfpdl5lvfzlip9qk7z5cfnx3jvh4v20vm4cvr9rb1yr"; - name = "kwrited-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/kwrited-5.13.4.tar.xz"; + sha256 = "1j9gl6d3j5mzydb4r9xmzxs313f2pj5phnh2n74nia672fn5kpqb"; + name = "kwrited-5.13.4.tar.xz"; }; }; libkscreen = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/libkscreen-5.13.2.tar.xz"; - sha256 = "05r56xynavq3zd3bvchy1yx3z0h8si12w8fcf8pqgdvr38vrqqm5"; - name = "libkscreen-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/libkscreen-5.13.4.tar.xz"; + sha256 = "1azcpc3jm006s8zswv1w22gcajyvs800xc77l6das5jrl4ddk309"; + name = "libkscreen-5.13.4.tar.xz"; }; }; libksysguard = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/libksysguard-5.13.2.tar.xz"; - sha256 = "1xbjb4lm7bn41zpy9plsg4qdqg3i4m9gzvpaqd1rvd9v24qzy7pi"; - name = "libksysguard-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/libksysguard-5.13.4.tar.xz"; + sha256 = "0k8q5bxk9zyv7c3nny1c399v8acqs618nw39q20pj2qdijl9ibvh"; + name = "libksysguard-5.13.4.tar.xz"; }; }; milou = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/milou-5.13.2.tar.xz"; - sha256 = "1mzhgj6q4siaiy9kccrdr4dpjij5gkd1l60kmw0lk80sn92cc5pd"; - name = "milou-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/milou-5.13.4.tar.xz"; + sha256 = "0rqwjb91a5x7piwdfh4xy8f2nhkfzdaja0ifpm7hrkysq6d9yzad"; + name = "milou-5.13.4.tar.xz"; }; }; oxygen = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/oxygen-5.13.2.tar.xz"; - sha256 = "09dxn73fx78j7d0qfvv7hw7h0pv0yaz1f7s2m9f5f9d666v8fja5"; - name = "oxygen-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/oxygen-5.13.4.tar.xz"; + sha256 = "0035z94v4fbdl5jcaggv1vqjxk9z1marf4vs8zm7fkz6hhcn4vj2"; + name = "oxygen-5.13.4.tar.xz"; }; }; plasma-browser-integration = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/plasma-browser-integration-5.13.2.tar.xz"; - sha256 = "08gdm4qyi89zffrk630cj8k6h0qimmv3va99s85bqwvjzslsf9i6"; - name = "plasma-browser-integration-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/plasma-browser-integration-5.13.4.tar.xz"; + sha256 = "19vqn3wbkfzsbf5rl61zaqgp10q83zxjmvvbn9325rp3dsv3i0jb"; + name = "plasma-browser-integration-5.13.4.tar.xz"; }; }; plasma-desktop = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/plasma-desktop-5.13.2.tar.xz"; - sha256 = "17xcvjbr5j75m8j54g9i7ny9qsiqvv930fgwdxzdwhvskca9lshi"; - name = "plasma-desktop-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/plasma-desktop-5.13.4.tar.xz"; + sha256 = "1wmyms3bjka9kgjc6zp17j8w707lnmr2kxqzqznm78c16h34lfdx"; + name = "plasma-desktop-5.13.4.tar.xz"; }; }; plasma-integration = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/plasma-integration-5.13.2.tar.xz"; - sha256 = "0273510djc7kbcvxw13dlhj3cislfrbryg8im8c4dasabafxfhmx"; - name = "plasma-integration-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/plasma-integration-5.13.4.tar.xz"; + sha256 = "0p5wqj0jdvwq7blj7j1va00jlkqkwcxfkcj7gpnjmnsggp25mpsq"; + name = "plasma-integration-5.13.4.tar.xz"; }; }; plasma-nm = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/plasma-nm-5.13.2.tar.xz"; - sha256 = "1shbgdm4019crijpg4xbs9lsan6h63gijqckh4acvjfplbmk39q0"; - name = "plasma-nm-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/plasma-nm-5.13.4.tar.xz"; + sha256 = "0qadmxzmw8a4r43ri2xxj4i884vraxlyxmwqkkn540x0aysyj4rq"; + name = "plasma-nm-5.13.4.tar.xz"; }; }; plasma-pa = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/plasma-pa-5.13.2.tar.xz"; - sha256 = "0sn59f3w3bz7xm41x6i03s9vd9p6vwynnj9xcnyc2797l0bf9vq9"; - name = "plasma-pa-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/plasma-pa-5.13.4.tar.xz"; + sha256 = "1xqmp19dkggfzapns94jr0jz03aphdlz31iw888w2qj730zdx97k"; + name = "plasma-pa-5.13.4.tar.xz"; }; }; plasma-sdk = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/plasma-sdk-5.13.2.tar.xz"; - sha256 = "1z1p8n327v1pgkdqj125nwdhip482lny1ryi7c2cdvivhppjdhv3"; - name = "plasma-sdk-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/plasma-sdk-5.13.4.tar.xz"; + sha256 = "13ddin88ila3imkhn9bgaf1i0bbbmcb4xigk2cps74s8vl98jpfa"; + name = "plasma-sdk-5.13.4.tar.xz"; }; }; plasma-tests = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/plasma-tests-5.13.2.tar.xz"; - sha256 = "0p7j3nhqvlywg32j627ci58ifn5zq9rgyiw0mv8gn79kghzkfc39"; - name = "plasma-tests-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/plasma-tests-5.13.4.tar.xz"; + sha256 = "0fzqw3ix9sa3m492xjz46wsaqs7cgfpcprdx3z05ww4217k5d4sf"; + name = "plasma-tests-5.13.4.tar.xz"; }; }; plasma-vault = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/plasma-vault-5.13.2.tar.xz"; - sha256 = "15w2qyjb4iab302v5n0a8xfiwj9hb62js82v17sln49axcs95xfb"; - name = "plasma-vault-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/plasma-vault-5.13.4.tar.xz"; + sha256 = "1acpn49vb645a30xnxxf0rylihb7n838l0ky5169n6dq96swam4j"; + name = "plasma-vault-5.13.4.tar.xz"; }; }; plasma-workspace = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/plasma-workspace-5.13.2.tar.xz"; - sha256 = "1rjdh6ikiri6nikl5idhczlk17bzcn29m3g1c7gd67s2fglvak0p"; - name = "plasma-workspace-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/plasma-workspace-5.13.4.tar.xz"; + sha256 = "1kvl6pbhqw7llv8llq020qvbk7glynix8c4dsh3dfp170xpg3qnh"; + name = "plasma-workspace-5.13.4.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/plasma-workspace-wallpapers-5.13.2.tar.xz"; - sha256 = "0bx7r1xz8k1imi0h9l2rbrk68dbr9zyydj5khvpdbl81c7mmfw8r"; - name = "plasma-workspace-wallpapers-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/plasma-workspace-wallpapers-5.13.4.tar.xz"; + sha256 = "11z8isy01vbgzb5jkbslin30himy5072wwrb010jw9ls9j5dz1cm"; + name = "plasma-workspace-wallpapers-5.13.4.tar.xz"; }; }; plymouth-kcm = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/plymouth-kcm-5.13.2.tar.xz"; - sha256 = "14n8b1ajrw8sx6b1bmlc2krsf3f6f2hwmp6rxay1bn3m3z1blndy"; - name = "plymouth-kcm-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/plymouth-kcm-5.13.4.tar.xz"; + sha256 = "1f18ys2b80smd975a18qkhxb3ipr31wx8g0pmbfscqclc6kma506"; + name = "plymouth-kcm-5.13.4.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.13.2"; + version = "1-5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/polkit-kde-agent-1-5.13.2.tar.xz"; - sha256 = "1z455nh28hhh4f1wxwd6zrxcg4cfpiz02jrbbgqi7x3bflmswc2a"; - name = "polkit-kde-agent-1-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/polkit-kde-agent-1-5.13.4.tar.xz"; + sha256 = "0wgj9pawwcgznqg7shp3zh65ag9cscnmamgr29x2lq9wwxqw2836"; + name = "polkit-kde-agent-1-5.13.4.tar.xz"; }; }; powerdevil = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/powerdevil-5.13.2.tar.xz"; - sha256 = "0g9ag9y9pip4q5agvbmp642vjcvj9355gc1j25wh3innml6z7jp0"; - name = "powerdevil-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/powerdevil-5.13.4.tar.xz"; + sha256 = "10zhm5z0hwh75fmcp7cz5c35zcywm7an73x2dh4fyl42cczfb0zl"; + name = "powerdevil-5.13.4.tar.xz"; }; }; sddm-kcm = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/sddm-kcm-5.13.2.tar.xz"; - sha256 = "0ya9l65i3lhk9zcnscsy1ps334k2nk7j3ixrv1xbfgr2w1plhkqx"; - name = "sddm-kcm-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/sddm-kcm-5.13.4.tar.xz"; + sha256 = "0g6alnlg8waxgf3cbzx838062qsdcfisxsw67zxykyp77spq00f0"; + name = "sddm-kcm-5.13.4.tar.xz"; }; }; systemsettings = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/systemsettings-5.13.2.tar.xz"; - sha256 = "0gzdh4cgvmbr99c96p6pw4a5l181rkpwpwfa79xm8pmr6lmcy254"; - name = "systemsettings-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/systemsettings-5.13.4.tar.xz"; + sha256 = "1z6c6kaz0ib76qsiq5cj6ya4mrdgmv3xa71hnwd2fbmv45agk8q4"; + name = "systemsettings-5.13.4.tar.xz"; }; }; user-manager = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/user-manager-5.13.2.tar.xz"; - sha256 = "1k3xkyfxs9xbgggs4ymyx1cx7fphxcnh0cfmwqdjbsa6fqjbh7jh"; - name = "user-manager-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/user-manager-5.13.4.tar.xz"; + sha256 = "1s968hf7p9rrv3b0bq47s1387cbl6iq5313m34xfv5h7rqr2cw3m"; + name = "user-manager-5.13.4.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/xdg-desktop-portal-kde-5.13.2.tar.xz"; - sha256 = "1vydh7vqycd9fgkiysnz3kf4xqqkvmzr2pmhbng4yz7vy4pci981"; - name = "xdg-desktop-portal-kde-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/xdg-desktop-portal-kde-5.13.4.tar.xz"; + sha256 = "02fv1v778rh512wcm2zqgn6q61459bjbcjj2xz63lp3iycl7avqi"; + name = "xdg-desktop-portal-kde-5.13.4.tar.xz"; }; }; } diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix index 77e8fb51602cb..36aa73f7274b8 100644 --- a/pkgs/development/compilers/gambit/default.nix +++ b/pkgs/development/compilers/gambit/default.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl }: +{ stdenv, callPackage, fetchurl }: callPackage ./build.nix { version = "4.8.9"; @@ -7,4 +7,5 @@ callPackage ./build.nix { url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.8/source/gambit-v4_8_9-devel.tgz"; sha256 = "1gwzz1ag9hlv266nvfq1bhwzrps3f2yghhffasjjqy8i8xwnry5p"; }; + inherit stdenv; } diff --git a/pkgs/development/compilers/gambit/unstable.nix b/pkgs/development/compilers/gambit/unstable.nix index 169ddb5a6a310..41d0ee930bf0f 100644 --- a/pkgs/development/compilers/gambit/unstable.nix +++ b/pkgs/development/compilers/gambit/unstable.nix @@ -1,10 +1,12 @@ -{ callPackage, fetchgit }: +{ stdenv, callPackage, fetchgit }: callPackage ./build.nix { - version = "unstable-2018-05-30"; + version = "unstable-2018-08-06"; +# git-version = "4.8.9-77-g91a4ad2c"; SRC = fetchgit { url = "https://github.com/feeley/gambit.git"; - rev = "ffe8841b56330eb86fd794b16dc7f83914ecc7c5"; - sha256 = "1xzkwa2f6zazybbgd5zynhr36krayhr29vsbras5ld63hkrxrp7q"; + rev = "91a4ad2c28375f067adedcaa61f9d66a4b536f4f"; + sha256 = "0px1ipvhh0hz8n38h6jv4y1nn163j8llvcy4l7p3hkdns5czwy1p"; }; + inherit stdenv; } diff --git a/pkgs/development/compilers/gerbil/default.nix b/pkgs/development/compilers/gerbil/default.nix index eaab0e71d3bde..6fa9fcc3de88f 100644 --- a/pkgs/development/compilers/gerbil/default.nix +++ b/pkgs/development/compilers/gerbil/default.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, gambit }: +{ stdenv, callPackage, fetchurl, gambit }: callPackage ./build.nix { version = "0.12-RELEASE"; @@ -8,4 +8,5 @@ callPackage ./build.nix { url = "https://github.com/vyzo/gerbil/archive/v0.12.tar.gz"; sha256 = "0nigr3mgrzai57q2jqac8f39zj8rcmic3277ynyzlgm8hhps71pq"; }; + inherit stdenv; } diff --git a/pkgs/development/compilers/gerbil/unstable.nix b/pkgs/development/compilers/gerbil/unstable.nix index 25c6b75fa03e1..66ead04b54296 100644 --- a/pkgs/development/compilers/gerbil/unstable.nix +++ b/pkgs/development/compilers/gerbil/unstable.nix @@ -1,12 +1,13 @@ -{ callPackage, fetchgit, gambit-unstable }: +{ stdenv, callPackage, fetchgit, gambit-unstable }: callPackage ./build.nix { - version = "unstable-2018-05-12"; - git-version = "0.13-DEV-437-gaefdb47f"; + version = "unstable-2018-08-11"; + git-version = "0.13-DEV-542-g274e1a22"; GAMBIT = gambit-unstable; SRC = fetchgit { url = "https://github.com/vyzo/gerbil.git"; - rev = "aefdb47f3d1ceaa735fd5c3dcaac2aeb0d4d2436"; - sha256 = "0xhsilm5kix5lsmykv273npp1gk6dgx9axh266mimwh7j0nxf7ms"; + rev = "274e1a22b2d2b708d5582594274ab52ee9ba1686"; + sha256 = "10j44ar4xfl8xmh276zg1ykd3r0vy7w2f2cg4p8slwnk9r251g2s"; }; + inherit stdenv; } diff --git a/pkgs/development/compilers/ghc/8.6.1.nix b/pkgs/development/compilers/ghc/8.6.1.nix index 8f0e521521707..fdb60ce3f2e81 100644 --- a/pkgs/development/compilers/ghc/8.6.1.nix +++ b/pkgs/development/compilers/ghc/8.6.1.nix @@ -77,12 +77,12 @@ let in stdenv.mkDerivation (rec { - version = "8.6.0.20180714"; + version = "8.6.0.20180810"; name = "${targetPrefix}ghc-${version}"; src = fetchurl { - url = "https://downloads.haskell.org/~ghc/8.6.1-alpha2/ghc-${version}-src.tar.xz"; - sha256 = "1jrkqrqdv2z9i9s1xaxhci34c9rjvlgr40y34bxsfj0hj1r28409"; + url = "https://downloads.haskell.org/~ghc/8.6.1-beta1/ghc-${version}-src.tar.xz"; + sha256 = "0b3nyjs4lsh67lfw7wh7r7kkf4g2xiypdxd77aycmwd3pdxj09yw"; }; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/jikes/default.nix b/pkgs/development/compilers/jikes/default.nix index 1e202160b3c5d..1247f369c5c98 100644 --- a/pkgs/development/compilers/jikes/default.nix +++ b/pkgs/development/compilers/jikes/default.nix @@ -9,5 +9,6 @@ stdenv.mkDerivation { meta = { platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.epl10; }; } diff --git a/pkgs/development/compilers/mosml/default.nix b/pkgs/development/compilers/mosml/default.nix new file mode 100644 index 0000000000000..5ea3f63ccd183 --- /dev/null +++ b/pkgs/development/compilers/mosml/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, gmp, perl }: + +stdenv.mkDerivation rec { + name = "mosml-${version}"; + version = "2.10.1"; + + buildInputs = [ gmp perl ]; + + makeFlags = "PREFIX=$(out)"; + + src = fetchurl { + url = "https://github.com/kfl/mosml/archive/ver-${version}.tar.gz"; + sha256 = "13x7wj94p0inn84pzpj52dch5s9lznqrj287bd3nk3dqd0v3kmgy"; + }; + + setSourceRoot = ''export sourceRoot="$(echo */src)"''; + + meta = with stdenv.lib; { + description = "A light-weight implementation of Standard ML"; + longDescription = '' + Moscow ML is a light-weight implementation of Standard ML (SML), a strict + functional language used in teaching and research. + ''; + homepage = http://mosml.org/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ vaibhavsagar ]; + }; +} diff --git a/pkgs/development/compilers/mruby/0001-Disables-IO-isatty-test-for-sandboxed-builds.patch b/pkgs/development/compilers/mruby/0001-Disables-IO-isatty-test-for-sandboxed-builds.patch new file mode 100644 index 0000000000000..779391fc62a9e --- /dev/null +++ b/pkgs/development/compilers/mruby/0001-Disables-IO-isatty-test-for-sandboxed-builds.patch @@ -0,0 +1,36 @@ +From f3db284516105fd30b5513a5528104574a7b8545 Mon Sep 17 00:00:00 2001 +From: Samuel Dionne-Riel <samuel@dionne-riel.com> +Date: Thu, 9 Aug 2018 19:07:45 -0400 +Subject: [PATCH] Disables `IO#isatty` test for sandboxed builds. + +--- + mrbgems/mruby-io/test/io.rb | 13 ------------- + 1 file changed, 13 deletions(-) + +diff --git a/mrbgems/mruby-io/test/io.rb b/mrbgems/mruby-io/test/io.rb +index e06b1499..e8a54736 100644 +--- a/mrbgems/mruby-io/test/io.rb ++++ b/mrbgems/mruby-io/test/io.rb +@@ -342,19 +342,6 @@ assert('IO#_read_buf') do + io.closed? + end + +-assert('IO#isatty') do +- skip "isatty is not supported on this platform" if MRubyIOTestUtil.win? +- f1 = File.open("/dev/tty") +- f2 = File.open($mrbtest_io_rfname) +- +- assert_true f1.isatty +- assert_false f2.isatty +- +- f1.close +- f2.close +- true +-end +- + assert('IO#pos=, IO#seek') do + fd = IO.sysopen $mrbtest_io_rfname + io = IO.new fd +-- +2.16.4 + diff --git a/pkgs/development/compilers/mruby/default.nix b/pkgs/development/compilers/mruby/default.nix new file mode 100644 index 0000000000000..3ab553678b6c4 --- /dev/null +++ b/pkgs/development/compilers/mruby/default.nix @@ -0,0 +1,38 @@ +{ stdenv, ruby, bison, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "mruby-${version}"; + version = "1.4.1"; + + src = fetchFromGitHub { + owner = "mruby"; + repo = "mruby"; + rev = version; + sha256 = "0pw72acbqgs4n1qa297nnja23v9hxz9g7190yfx9kwm7mgbllmww"; + }; + + patches = [ + ./0001-Disables-IO-isatty-test-for-sandboxed-builds.patch + ]; + + nativeBuildInputs = [ ruby bison ]; + + # Necessary so it uses `gcc` instead of `ld` for linking. + # https://github.com/mruby/mruby/blob/35be8b252495d92ca811d76996f03c470ee33380/tasks/toolchains/gcc.rake#L25 + preBuild = if stdenv.isLinux then "unset LD" else null; + + installPhase = '' + mkdir $out + cp -R build/host/{bin,lib} $out + ''; + + doCheck = true; + + meta = with stdenv.lib; { + description = "An embeddable implementation of the Ruby language"; + homepage = https://mruby.org; + maintainers = [ maintainers.nicknovitski ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix index a0daa7df1737d..b95f6e5ee95fd 100644 --- a/pkgs/development/compilers/nasm/default.nix +++ b/pkgs/development/compilers/nasm/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { description = "An 80x86 and x86-64 assembler designed for portability and modularity"; platforms = platforms.unix; maintainers = with maintainers; [ pSub willibutz ]; + license = licenses.bsd2; }; } diff --git a/pkgs/development/compilers/ponyc/pony-stable.nix b/pkgs/development/compilers/ponyc/pony-stable.nix index f27147d9743aa..6dfb099242d6b 100644 --- a/pkgs/development/compilers/ponyc/pony-stable.nix +++ b/pkgs/development/compilers/ponyc/pony-stable.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pony-stable-${version}"; - version = "0.1.4"; + version = "0.1.6"; src = fetchFromGitHub { owner = "ponylang"; repo = "pony-stable"; rev = version; - sha256 = "18ncxdk37r9sp2wnrgqj29nvqljqq9m154pkdv8b6b5k9knpradx"; + sha256 = "02lqba75psnxcxj2y8lm1fy1hmwa088nvxjghhpnlkqbwz7wa2sw"; }; buildInputs = [ ponyc ]; diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index 763b4ab0dbeb8..42969a5253ed1 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -3,13 +3,13 @@ buildOcaml rec { name = "reason"; - version = "3.3.2"; + version = "3.3.3"; src = fetchFromGitHub { owner = "facebook"; repo = "reason"; - rev = "68a4124c772ee25c4729b005c8643851b1e17b92"; - sha256 = "01v17m94ds98qk727mwpyx0a362zdf9s8x1fh8gp9jd9v3n6bc2d"; + rev = "fefe5e4db3a54a7946c2220ee037dd2f407011c9"; + sha256 = "1x0dbacgq9pa36zgzwrc0gm14wbb6v27y9bf7wcwk55a1ck0am18"; }; propagatedBuildInputs = [ menhir merlin_extend ppx_tools_versioned ]; diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix index 877331383a7d4..5e6ee7fac6f12 100644 --- a/pkgs/development/coq-modules/coq-ext-lib/default.nix +++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix @@ -4,7 +4,8 @@ let params = { "8.5" = { version = "0.9.4"; sha256 = "1y66pamgsdxlq2w1338lj626ln70cwj7k53hxcp933g8fdsa4hp0"; }; "8.6" = { version = "0.9.5"; sha256 = "1b4cvz3llxin130g13calw5n1zmvi6wdd5yb8a41q7yyn2hd3msg"; }; - "8.7" = { version = "0.9.5"; sha256 = "1b4cvz3llxin130g13calw5n1zmvi6wdd5yb8a41q7yyn2hd3msg"; }; + "8.7" = { version = "0.9.7"; sha256 = "00v4bm4glv1hy08c8xsm467az6d1ashrznn8p2bmbmmp52lfg7ag"; }; + "8.8" = { version = "0.9.8"; sha256 = "0z1ix855kdjl7zw5ca664h5njd1x8mmvf5wi37fck4dj9dgamwlz"; }; }; param = params."${coq.coq-version}"; in diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5adef91f420ac..e32ccfa179395 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -86,7 +86,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "1l6xgvn3l0kkly5jvg57msx09bf1jwdff7m61w8yf2pxsrh5ybxl"; + sha256 = "0a7h21cwfvprj5xfyivjzg2hbs71xp85l9v6kyp58mlqvwy3zffl"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; @@ -727,7 +727,7 @@ self: super: { owner = "haskell-servant"; repo = "servant"; rev = "v${ver}"; - sha256 = "0bwd5dy3crn08dijn06dr3mdsww98kqxfp8v5mvrdws5glvcxdsg"; + sha256 = "0kqglih3rv12nmkzxvalhfaaafk4b2irvv9x5xmc48i1ns71y23l"; }}/doc"; buildInputs = with pkgs.pythonPackages; [ sphinx recommonmark sphinx_rtd_theme ]; makeFlags = "html"; @@ -1080,13 +1080,19 @@ self: super: { haddock-library = doJailbreak (dontCheck super.haddock-library); haddock-library_1_6_0 = doJailbreak (dontCheck super.haddock-library_1_6_0); - # The test suite does not know how to find the 'cabal2nix' binary. - cabal2nix = overrideCabal super.cabal2nix (drv: { - preCheck = '' - export PATH="$PWD/dist/build/cabal2nix:$PATH" - export HOME="$TMPDIR/home" - ''; - }); + cabal2nix = + let + # The test suite does not know how to find the 'cabal2nix' binary. + drv1 = overrideCabal super.cabal2nix (drv: { + preCheck = '' + export PATH="$PWD/dist/build/cabal2nix:$PATH" + export HOME="$TMPDIR/home" + ''; + }); + # cabal2nix requires hpack >= 0.29.6 but the LTS has hpack-0.28.2. + # Lets remove this once the LTS has upraded to 0.29.6. + drv2 = drv1.override { hpack = self.hpack_0_29_6; }; + in drv2; # Break out of "aeson <1.3, temporary <1.3". stack = doJailbreak super.stack; @@ -1114,10 +1120,13 @@ self: super: { # needed because of testing-feat >=0.4.0.2 && <1.1 language-ecmascript = doJailbreak super.language-ecmascript; - # sexpr is old, broken and has no issue-tracker. Let's fix it the best we can. + # sexpr is old, broken and has no issue-tracker. Let's fix it the best we can. sexpr = appendPatch (overrideCabal super.sexpr (drv: { isExecutable = false; libraryHaskellDepends = drv.libraryHaskellDepends ++ [self.QuickCheck]; })) ./patches/sexpr-0.2.1.patch; + + # Can be removed once yi-language >= 0.18 is in the LTS + yi-core = super.yi-core.override { yi-language = self.yi-language_0_18_0; }; } diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d5b54e3f8f79b..21660cfb7d2da 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -11467,8 +11467,8 @@ self: { pname = "ListLike"; version = "4.6"; sha256 = "16jsj979mzjrgmpa20pls9ganym3wsps49paks1sb1gmlmwyrkf1"; - revision = "1"; - editedCabalFile = "1mbfywf17nnwy2mc15zrsv0j30y1dpblim49nmndpbygq8j26y8j"; + revision = "2"; + editedCabalFile = "1mca2r4gjznqdh4kck5cjkn53isgkhvkf3ri09qsn7nsssvgki0g"; libraryHaskellDepends = [ array base bytestring containers deepseq dlist fmlist text utf8-string vector @@ -18139,17 +18139,21 @@ self: { }) {}; "Unique" = callPackage - ({ mkDerivation, base, containers, extra, hashable, hspec - , QuickCheck, unordered-containers + ({ mkDerivation, base, bytestring, containers, criterion, extra + , hashable, hspec, QuickCheck, quickcheck-instances + , unordered-containers }: mkDerivation { pname = "Unique"; - version = "0.4.7.2"; - sha256 = "0ssvg5sjhvadsfym02y0l712viv9xk2sfvrfs1q7260p7025aqdm"; + version = "0.4.7.5"; + sha256 = "0wd4rwbn765n2jyzwwwcghqh1qx69wb9ci7wmvw1ahzg0wbadbqz"; libraryHaskellDepends = [ base containers extra hashable unordered-containers ]; testHaskellDepends = [ base containers hspec QuickCheck ]; + benchmarkHaskellDepends = [ + base bytestring criterion hashable QuickCheck quickcheck-instances + ]; description = "It provides the functionality like unix \"uniq\" utility"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -23168,16 +23172,18 @@ self: { }) {}; "alphachar" = callPackage - ({ mkDerivation, base, directory, doctest, filepath, lens, parsec - , parsers, QuickCheck, template-haskell + ({ mkDerivation, ansi-wl-pprint, base, hedgehog, lens, parsec + , parsers, pretty, semigroups, tasty, tasty-hedgehog, tasty-hspec + , tasty-hunit, text }: mkDerivation { pname = "alphachar"; - version = "0.0.1"; - sha256 = "0pdpwxjyrnh6ydiacg67lk9hbmxb3188spml08v60iz1dmshy3iv"; - libraryHaskellDepends = [ base lens parsers ]; + version = "0.0.3"; + sha256 = "1wrd881kwzzfnjkp9ajy1gaxizd17zb60f7sbalwg4n38lk7qvhx"; + libraryHaskellDepends = [ base lens parsers semigroups ]; testHaskellDepends = [ - base directory doctest filepath parsec QuickCheck template-haskell + ansi-wl-pprint base hedgehog lens parsec parsers pretty tasty + tasty-hedgehog tasty-hspec tasty-hunit text ]; description = "A character between a-z"; license = stdenv.lib.licenses.bsd3; @@ -26076,8 +26082,8 @@ self: { }: mkDerivation { pname = "amqp-utils"; - version = "0.3.3.1"; - sha256 = "1psv3n3hgysica7dk9hcvkvxwx6fq8srhrxvpf7mb7mrzjyljvrk"; + version = "0.3.4.0"; + sha256 = "1p02nf9i8v17f9nyx76306zdq4qlvqf6j86i88kfnjkpb8hfxl84"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -26773,8 +26779,8 @@ self: { }: mkDerivation { pname = "antiope-athena"; - version = "5.0.1"; - sha256 = "1b8dcjm4a07wpn1kigz87lkm7rljlya43c46vw7my3svqy35a6dv"; + version = "6.0.0"; + sha256 = "13l8biwl66pn3n8jbbc2fbj3vk1w6rjnzrdmiimxl0nd7zm6vk4r"; libraryHaskellDepends = [ amazonka amazonka-athena amazonka-core base lens resourcet text unliftio-core @@ -26793,8 +26799,8 @@ self: { }: mkDerivation { pname = "antiope-core"; - version = "5.0.1"; - sha256 = "1s6b0lm5mf6dg1zrkmzfrqacgr1wa6lgphx0zq3kqzp2b7gdzkbv"; + version = "6.0.0"; + sha256 = "1cmfda3dfg282a8rg6hkqv17fzfia5c7vm4gh0jdib4ggl5yxcrv"; libraryHaskellDepends = [ amazonka amazonka-core base bytestring generic-lens http-client lens monad-logger mtl resourcet transformers unliftio-core @@ -26814,8 +26820,8 @@ self: { }: mkDerivation { pname = "antiope-dynamodb"; - version = "5.0.1"; - sha256 = "0nz6bhv1i7kwd8a4m951p3jkzwkzayb19r0ds3adrq5bp79ajgpy"; + version = "6.0.0"; + sha256 = "1i45fvxn75yd7fpypzz183j7q3n0kvrrxw78kr310a08fdngapn8"; libraryHaskellDepends = [ amazonka amazonka-core amazonka-dynamodb antiope-core base generic-lens lens text unliftio-core unordered-containers @@ -26835,8 +26841,8 @@ self: { }: mkDerivation { pname = "antiope-messages"; - version = "5.0.1"; - sha256 = "1g7nrdas5fz5rvx4yhmbk41r0ir8i5gwjmpyprbjggkipnqna5x4"; + version = "6.0.0"; + sha256 = "1km57vpm8q77lpxyvmpvgj6csrixf8kdxqnwxkg065ylk0cp1hw7"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 amazonka-sqs antiope-s3 base generic-lens lens lens-aeson monad-loops network-uri text @@ -26859,8 +26865,8 @@ self: { }: mkDerivation { pname = "antiope-s3"; - version = "5.0.1"; - sha256 = "1nwcyapaxknhlfbb0xrklrxc8xs5bzriz5qs651jn9xi1awm2qxl"; + version = "6.0.0"; + sha256 = "1s4cixqkflf3s8g6x75783wwrr5973wls2axjj8raspa4qfl2zsn"; libraryHaskellDepends = [ amazonka amazonka-core amazonka-s3 base bytestring conduit conduit-extra exceptions generic-lens http-types lens monad-logger @@ -26881,8 +26887,8 @@ self: { }: mkDerivation { pname = "antiope-sns"; - version = "5.0.1"; - sha256 = "113yj69cb7qaqcs5yijwhqhzvlhh88rnbfcnix3y61cg3250iwkk"; + version = "6.0.0"; + sha256 = "0fbkd7r8iq8sjfa0k6kv8clld323i1xhib5k7kpl2zlan4xfk2k9"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-sns base generic-lens lens text unliftio-core @@ -26902,8 +26908,8 @@ self: { }: mkDerivation { pname = "antiope-sqs"; - version = "5.0.1"; - sha256 = "0if8yq8j14syr9ks74inz76ks1aspvrhzmn6444xni3bzz7dr2mq"; + version = "6.0.0"; + sha256 = "0xfaayajlzb9wvqnmlfwh990kzsy738qnscsyqnn07zp61047wxf"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 amazonka-sqs antiope-messages antiope-s3 base generic-lens lens lens-aeson @@ -28734,18 +28740,18 @@ self: { }) {}; "ascii-string" = callPackage - ({ mkDerivation, base, bytestring, cereal, deferred-folds, foldl - , hashable, primitive, primitive-extras, QuickCheck + ({ mkDerivation, base, bytestring, cereal, deepseq, deferred-folds + , foldl, hashable, primitive, primitive-extras, QuickCheck , quickcheck-instances, rerebase, tasty, tasty-hunit , tasty-quickcheck }: mkDerivation { pname = "ascii-string"; - version = "1"; - sha256 = "054vi22vhn9bbv76spxbsml7141yqwgcy1fasm9mv2anw8kdzbq8"; + version = "1.0.1"; + sha256 = "0br053njgnfqwgmk7zz0fayiyycqq3sw8kxjpb2s9wx17arnq5kz"; libraryHaskellDepends = [ - base bytestring cereal deferred-folds foldl hashable primitive - primitive-extras + base bytestring cereal deepseq deferred-folds foldl hashable + primitive primitive-extras ]; testHaskellDepends = [ cereal QuickCheck quickcheck-instances rerebase tasty tasty-hunit @@ -30894,7 +30900,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "avro_0_3_4_0" = callPackage + "avro_0_3_4_1" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, binary , bytestring, containers, data-binary-ieee754, directory, entropy , extra, fail, hashable, hspec, lens, lens-aeson, mtl, pure-zlib @@ -30903,8 +30909,8 @@ self: { }: mkDerivation { pname = "avro"; - version = "0.3.4.0"; - sha256 = "1242wr53an9av6kynv9wlgf997zdmxcq9fbjq2rgb8wf1hckxxzd"; + version = "0.3.4.1"; + sha256 = "1v6ixrm870182krvdj62waa701pwwq93ca2yjrmz00jkmblj9kxm"; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring containers data-binary-ieee754 entropy fail hashable mtl pure-zlib scientific @@ -31893,15 +31899,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "backprop_0_2_6_0" = callPackage + "backprop_0_2_6_1" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, directory , hmatrix, microlens, microlens-th, mwc-random, primitive , reflection, time, transformers, vector, vinyl }: mkDerivation { pname = "backprop"; - version = "0.2.6.0"; - sha256 = "0j2nr4wj05mz49sm9d5ahyvf5j4nmgndy60w2zqf93g18j8wi3yi"; + version = "0.2.6.1"; + sha256 = "1rn72fawix00byz7kyvn65g0h16mh8msiw6lx9l3xi1927hn28nj"; libraryHaskellDepends = [ base containers deepseq microlens primitive reflection transformers vector vinyl @@ -34213,31 +34219,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "binary_0_10_0_0" = callPackage - ({ mkDerivation, array, attoparsec, base, bytestring, Cabal, cereal - , containers, criterion, deepseq, directory, filepath - , generic-deriving, HUnit, mtl, QuickCheck, random, test-framework - , test-framework-quickcheck2, unordered-containers, zlib - }: - mkDerivation { - pname = "binary"; - version = "0.10.0.0"; - sha256 = "1lkh6cpayj7vdkkmacgkpi5dgypsjkx3yzjw6d3c3zp8fwsgwgk1"; - libraryHaskellDepends = [ array base bytestring containers ]; - testHaskellDepends = [ - array base bytestring Cabal containers directory filepath HUnit - QuickCheck random test-framework test-framework-quickcheck2 - ]; - benchmarkHaskellDepends = [ - array attoparsec base bytestring cereal containers criterion - deepseq directory filepath generic-deriving mtl - unordered-containers zlib - ]; - description = "Binary serialisation for Haskell values using lazy ByteStrings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "binary-bits" = callPackage ({ mkDerivation, base, binary, bytestring, QuickCheck, random , test-framework, test-framework-quickcheck2 @@ -35265,8 +35246,8 @@ self: { ({ mkDerivation, base, bindings-DSL, lxc }: mkDerivation { pname = "bindings-lxc"; - version = "0.2.1"; - sha256 = "11rhw6593bnl1hzdn13px5zawbdanwz2219hm1ssxckwbkjlbvjg"; + version = "0.2.2"; + sha256 = "03nmhmggvnd3xqkg12212ysz7rr7n09vn9165qj5vw0qxr96q5n7"; libraryHaskellDepends = [ base bindings-DSL ]; librarySystemDepends = [ lxc ]; description = "Direct Haskell bindings to LXC (Linux containers) C API"; @@ -37940,8 +37921,8 @@ self: { }: mkDerivation { pname = "boolector"; - version = "0.0.0.3"; - sha256 = "0wi22ccshk2p4hgd286h9xz1zgm5ng4vr9z9k0kv3kqwyz0qy1qk"; + version = "0.0.0.4"; + sha256 = "0f5yfkkgarwkbdkxkjj8fsd7fgq683qjxyv88wqk724dx6wv3yn7"; libraryHaskellDepends = [ base containers directory mtl temporary ]; @@ -43757,6 +43738,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cereal_0_5_7_0" = callPackage + ({ mkDerivation, array, base, bytestring, containers, ghc-prim + , QuickCheck, test-framework, test-framework-quickcheck2 + }: + mkDerivation { + pname = "cereal"; + version = "0.5.7.0"; + sha256 = "1j7imh2mzqcljld7sx0av69699955rpy3hzivi5723i6a9nszgbs"; + libraryHaskellDepends = [ + array base bytestring containers ghc-prim + ]; + testHaskellDepends = [ + base bytestring QuickCheck test-framework + test-framework-quickcheck2 + ]; + description = "A binary serialization library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cereal-conduit" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, HUnit, mtl , resourcet, transformers @@ -65472,8 +65473,8 @@ self: { }: mkDerivation { pname = "dump-core"; - version = "0.1.3.1"; - sha256 = "1n0x8p4zzc73ysf18zyrkhwiyz6j4kgwwiml64zm7pyyhskvrh3p"; + version = "0.1.3.2"; + sha256 = "04p3x8lvf4if82xjin9cxhc3r478lp3zmr3xn33xqp37lmcqvr5k"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers directory filepath ghc monadLib @@ -66512,20 +66513,21 @@ self: { }) {}; "edges" = callPackage - ({ mkDerivation, base, cereal, contravariant, deferred-folds, foldl - , monad-par, pointed, potoki, potoki-cereal, primitive - , primitive-extras, profunctors, QuickCheck, quickcheck-instances - , rerebase, semigroupoids, tasty, tasty-hunit, tasty-quickcheck - , text, vector + ({ mkDerivation, base, cereal, contravariant, deepseq + , deferred-folds, foldl, hashable, monad-par, pointed, potoki + , potoki-cereal, primitive, primitive-extras, profunctors + , QuickCheck, quickcheck-instances, rerebase, semigroupoids, tasty + , tasty-hunit, tasty-quickcheck, text, unordered-containers, vector }: mkDerivation { pname = "edges"; - version = "0.6"; - sha256 = "1wc65nl987xvl8ryrbk8am1hslagaglb9xm79mfsm3fzjp6ck7gd"; + version = "0.9.1.1"; + sha256 = "12alvmgxp488sg1km1j7kjlsbdk8xh6kxdpyxbvz4js6v1z54y0p"; libraryHaskellDepends = [ - base cereal contravariant deferred-folds foldl monad-par pointed - potoki potoki-cereal primitive primitive-extras profunctors - QuickCheck semigroupoids text vector + base cereal contravariant deepseq deferred-folds foldl hashable + monad-par pointed potoki potoki-cereal primitive primitive-extras + profunctors QuickCheck semigroupoids text unordered-containers + vector ]; testHaskellDepends = [ cereal foldl QuickCheck quickcheck-instances rerebase tasty @@ -71299,8 +71301,8 @@ self: { }: mkDerivation { pname = "extensible-effects"; - version = "3.0.0.0"; - sha256 = "1sqvdwqi3aqqhsjny7h1i7gany4b79nqc539b5arwksjvsgmv2yb"; + version = "3.1.0.0"; + sha256 = "0p4vk4k6922ar853zb85jm4si7y1qdr1wkx4pwfd613a5ar23440"; libraryHaskellDepends = [ base monad-control transformers-base ]; testHaskellDepends = [ base doctest HUnit monad-control QuickCheck silently test-framework @@ -72685,6 +72687,24 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "fedora-haskell-tools_0_6" = callPackage + ({ mkDerivation, base, csv, directory, filepath, HTTP, process + , time, unix + }: + mkDerivation { + pname = "fedora-haskell-tools"; + version = "0.6"; + sha256 = "06yr6hyksdqz0nksw0m23cqik51jjr74241xx96979pvw07zcym4"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base csv directory filepath HTTP process time unix + ]; + description = "Building and maintenance tools for Fedora Haskell"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fedora-packages" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hlint , HsOpenSSL, hspec, http-streams, io-streams, lens, text @@ -76773,10 +76793,8 @@ self: { }: mkDerivation { pname = "free-algebras"; - version = "0.0.2.0"; - sha256 = "06q7gmldzr3y7pmk76nhbbjgny518n1kw5k7011d6rhzj0kfwqgl"; - revision = "1"; - editedCabalFile = "0jcyr0f8mfsk3w24fnrnjr3arj48cl9h708mqbdglg4z7l1n22ba"; + version = "0.0.3.0"; + sha256 = "1qkgpmw2kv3x436f600cw73gdvfgjdl5i8nx80nh7q7dsg2ynl72"; libraryHaskellDepends = [ base constraints containers data-fix free groups kan-extensions mtl natural-numbers transformers @@ -77412,8 +77430,8 @@ self: { ({ mkDerivation, base, bytestring, process, text }: mkDerivation { pname = "fromhtml"; - version = "0.1.0.4"; - sha256 = "1p1qkidh5wgfgrqqa59zi77rvgphh2wh8ldql4plxq5flh2zszkx"; + version = "1.0.0"; + sha256 = "0idfjkwlg0g5vgv8x5m302ra4w23sgvq29gbbgyx99afrhxqh37l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring process text ]; @@ -79578,6 +79596,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "generic-lens_1_0_0_2" = callPackage + ({ mkDerivation, base, criterion, deepseq, doctest, HUnit + , inspection-testing, lens, profunctors, QuickCheck, tagged + }: + mkDerivation { + pname = "generic-lens"; + version = "1.0.0.2"; + sha256 = "0s21jfw0ndkkmx7di3q0b7xj7hws6yxxcsflal617c44iqc8lvsy"; + libraryHaskellDepends = [ base profunctors tagged ]; + testHaskellDepends = [ + base doctest HUnit inspection-testing lens profunctors + ]; + benchmarkHaskellDepends = [ + base criterion deepseq lens QuickCheck + ]; + description = "Generically derive traversals, lenses and prisms"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "generic-lens-labels" = callPackage ({ mkDerivation, base, generic-lens }: mkDerivation { @@ -81549,13 +81587,12 @@ self: { }) {}; "ghc-syb-utils" = callPackage - ({ mkDerivation, base, directory, filepath, ghc, ghc-paths, syb }: + ({ mkDerivation, base, bytestring, ghc, syb }: mkDerivation { pname = "ghc-syb-utils"; - version = "0.2.3.3"; - sha256 = "0fj7cqkdkb2kbfsif62bgc17cymnxjr6nnbsd1z4hfw8hz4pchjz"; - libraryHaskellDepends = [ base ghc syb ]; - testHaskellDepends = [ base directory filepath ghc ghc-paths ]; + version = "0.3.0.0"; + sha256 = "0mfnlp0z64999cc3jgzi3x5s428gs5jsqmmbr2n5v7shh0csnff4"; + libraryHaskellDepends = [ base bytestring ghc syb ]; description = "Scrap Your Boilerplate utilities for the GHC API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -81621,11 +81658,11 @@ self: { ({ mkDerivation, base, bytestring, criterion, text }: mkDerivation { pname = "ghc-trace-events"; - version = "0.0.0"; - sha256 = "00lq6bcl78drqlzj39avf9k2x2q4d2fdac3rrxrxicsdwry6brkk"; + version = "0.0.0.1"; + sha256 = "0b9s07wy26f9xswg6ysylpjaa9gv9iqw50n3zqpkj3jr8ah8y3kl"; libraryHaskellDepends = [ base bytestring text ]; benchmarkHaskellDepends = [ base bytestring criterion ]; - description = "Faster replacements for traceEvent and traceEventMarker"; + description = "Faster replacements for traceEvent and traceMarker"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -83168,8 +83205,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "6.20180719"; - sha256 = "13fbkdf461z4wqvjlzfjp3h17xyy8jb1av4s6jmlg1jl7656q96k"; + version = "6.20180807"; + sha256 = "1wkqh1y58m0z1mf2j33qhndpxcjwv8mbv384kdk17vn0lp9zas1s"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-f-s3" @@ -85064,12 +85101,12 @@ self: { }) {}; "gmpint" = callPackage - ({ mkDerivation, base, gmp, micro-recursion-schemes }: + ({ mkDerivation, base, gmp }: mkDerivation { pname = "gmpint"; - version = "0.1.1.1"; - sha256 = "02zr0acsf7zpyl369c9063qp6dgpblcb73q2m9fwz63ya58ixbk4"; - libraryHaskellDepends = [ base micro-recursion-schemes ]; + version = "0.1.1.2"; + sha256 = "0kb3gc9a9wd1ci5jpbpa253hqhx8w6if52yppk2k34yvm1385k35"; + libraryHaskellDepends = [ base ]; librarySystemDepends = [ gmp ]; description = "GMP integer conversions"; license = stdenv.lib.licenses.bsd3; @@ -89584,6 +89621,17 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {gtksourceview3 = pkgs.gnome3.gtksourceview;}; + "guarded-allocation" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "guarded-allocation"; + version = "0.0"; + sha256 = "1fj8zf9drvkd8bydiy7g0z9dqqjn7d8mf1jdhwcyx6c013ixnmsj"; + libraryHaskellDepends = [ base ]; + description = "Memory allocation with added stress tests and integrity checks"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "guarded-rewriting" = callPackage ({ mkDerivation, base, instant-generics }: mkDerivation { @@ -95489,8 +95537,8 @@ self: { }: mkDerivation { pname = "haskell-names"; - version = "0.9.1"; - sha256 = "1ybcdxz6y0l5qsq3vd0ii6m1ifysc2k8852lzw0nfs9i4q9pnwhh"; + version = "0.9.2"; + sha256 = "1gfqyh0lgi4n20dmh6pavxixy3flw385fp2iisks99l30nzn0kyv"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers data-lens-light filepath @@ -97781,19 +97829,19 @@ self: { ({ mkDerivation, base, base-prelude, bytestring, contravariant , foldl, hasql, hasql-cursor-transaction, hasql-transaction , profunctors, QuickCheck, quickcheck-instances, rebase, tasty - , tasty-hunit, tasty-quickcheck, tasty-smallcheck + , tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "hasql-cursor-query"; - version = "0.4.4.1"; - sha256 = "1lc3x3pwfahm81pfncky6mqsz6fjyj0szwi4qhf1k1drx36wr3db"; + version = "0.4.4.2"; + sha256 = "1h57x0az7hlmkbwmhdm0y4c63ypx48gkkw07rb2lj5sizn9j2qq9"; libraryHaskellDepends = [ base base-prelude bytestring contravariant foldl hasql hasql-cursor-transaction hasql-transaction profunctors ]; testHaskellDepends = [ foldl hasql QuickCheck quickcheck-instances rebase tasty - tasty-hunit tasty-quickcheck tasty-smallcheck + tasty-hunit tasty-quickcheck ]; description = "A declarative abstraction over PostgreSQL Cursor"; license = stdenv.lib.licenses.mit; @@ -97807,8 +97855,8 @@ self: { }: mkDerivation { pname = "hasql-cursor-transaction"; - version = "0.6.3"; - sha256 = "12vzkay4r0pzz41p4n60zd077yigr3373i5nr8cpf8z39msj8vaj"; + version = "0.6.3.1"; + sha256 = "05d01gb7ag9rcpk8vwizsbyi0lxd1fh6r6y4a6pvinj5sa2qn1hn"; libraryHaskellDepends = [ base base-prelude bytestring bytestring-tree-builder contravariant contravariant-extras hasql hasql-transaction transformers @@ -99264,8 +99312,8 @@ self: { }: mkDerivation { pname = "hdevtools"; - version = "0.1.6.1"; - sha256 = "0h1l74ky9a5an7j60i9razifm49v232g8f8p8fg1arv59b7nmr77"; + version = "0.1.7.0"; + sha256 = "188ayzn8yvlr3jl478ff1fadj766mq06fgb4xr4szpilppg8l3kg"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -99846,6 +99894,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hedis_0_10_3" = callPackage + ({ mkDerivation, async, base, bytestring, bytestring-lexing + , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri + , resource-pool, scanner, slave-thread, stm, test-framework + , test-framework-hunit, text, time, tls, unordered-containers + , vector + }: + mkDerivation { + pname = "hedis"; + version = "0.10.3"; + sha256 = "0wapsg0amlmzayphchng67ih3ivp0mk3vgi8x1mzrkd1xrlgav3v"; + libraryHaskellDepends = [ + async base bytestring bytestring-lexing deepseq errors HTTP mtl + network network-uri resource-pool scanner stm text time tls + unordered-containers vector + ]; + testHaskellDepends = [ + async base bytestring doctest HUnit mtl slave-thread stm + test-framework test-framework-hunit text time + ]; + benchmarkHaskellDepends = [ base mtl time ]; + description = "Client library for the Redis datastore: supports full command set, pipelining"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hedis-config" = callPackage ({ mkDerivation, aeson, base, bytestring, hedis, scientific, text , time @@ -101892,6 +101966,23 @@ self: { license = stdenv.lib.licenses.mit; }) {inherit (pkgs) systemd;}; + "hidapi_0_1_5" = callPackage + ({ mkDerivation, base, bytestring, deepseq, deepseq-generics + , systemd + }: + mkDerivation { + pname = "hidapi"; + version = "0.1.5"; + sha256 = "0pjrrm8rpcwwsc5ck36p0zyk5rr5jri8c79436whk8xxpnyf09ip"; + libraryHaskellDepends = [ + base bytestring deepseq deepseq-generics + ]; + librarySystemDepends = [ systemd ]; + description = "Haskell bindings to HIDAPI"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) systemd;}; + "hidden-char" = callPackage ({ mkDerivation, base, hspec }: mkDerivation { @@ -102475,6 +102566,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hinotify_0_4" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , unix + }: + mkDerivation { + pname = "hinotify"; + version = "0.4"; + sha256 = "1x1lm685ws2q0z0ibwq6x3l72xh67mj06s36xiga3al48d92q63x"; + libraryHaskellDepends = [ async base bytestring containers unix ]; + testHaskellDepends = [ base bytestring directory unix ]; + description = "Haskell binding to inotify"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hinotify-bytestring" = callPackage ({ mkDerivation, base, bytestring, containers, directory , posix-paths, unix, utf8-string @@ -103624,8 +103730,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "2.1.8"; - sha256 = "1kkmgqbw2n4sl7wcqbdqv54n7p5zjfx8c970s1lw25mfs3ryn4wp"; + version = "2.1.9"; + sha256 = "0q7acb636gzkp7qq1cyx04xjjw1ndpcxc49brmg61rbl0z1cxqsx"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -103834,6 +103940,8 @@ self: { pname = "hmatrix-backprop"; version = "0.1.2.3"; sha256 = "1x833a48czc2hphswxgwf1ihkgxz13w3bz2d2zs9dqq8xkzdf4mx"; + revision = "1"; + editedCabalFile = "03zrx1kvyz8gn2w2ygd7ql98yimsm3kyrnrr1cc99mz1cm0phnrv"; libraryHaskellDepends = [ backprop base ghc-typelits-knownnat ghc-typelits-natnormalise hmatrix hmatrix-vector-sized microlens vector vector-sized @@ -103847,6 +103955,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hmatrix-backprop_0_1_2_4" = callPackage + ({ mkDerivation, backprop, base, finite-typelits + , ghc-typelits-knownnat, ghc-typelits-natnormalise, hedgehog + , hmatrix, hmatrix-vector-sized, microlens, microlens-platform + , vector, vector-sized, vinyl + }: + mkDerivation { + pname = "hmatrix-backprop"; + version = "0.1.2.4"; + sha256 = "0v3xx72928pwfr9ki01apgqyc3dh1qakr9y6swiiwmgm7ms7qn6a"; + libraryHaskellDepends = [ + backprop base ghc-typelits-knownnat ghc-typelits-natnormalise + hmatrix hmatrix-vector-sized microlens vector vector-sized vinyl + ]; + testHaskellDepends = [ + backprop base finite-typelits hedgehog hmatrix hmatrix-vector-sized + microlens microlens-platform vector-sized vinyl + ]; + description = "hmatrix operations lifted for backprop"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hmatrix-banded" = callPackage ({ mkDerivation, base, hmatrix, liblapack, transformers }: mkDerivation { @@ -113911,17 +114042,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hw-rankselect_0_12_0_3" = callPackage + "hw-rankselect_0_12_0_4" = callPackage ({ mkDerivation, base, bytestring, conduit, criterion, deepseq - , directory, hedgehog, hspec, hspec-discover, hw-balancedparens - , hw-bits, hw-hedgehog, hw-hspec-hedgehog, hw-prim - , hw-rankselect-base, lens, mmap, mtl, optparse-applicative - , QuickCheck, resourcet, transformers, vector + , directory, hedgehog, hspec, hw-balancedparens, hw-bits + , hw-hedgehog, hw-hspec-hedgehog, hw-prim, hw-rankselect-base, lens + , mmap, mtl, optparse-applicative, QuickCheck, resourcet + , transformers, vector }: mkDerivation { pname = "hw-rankselect"; - version = "0.12.0.3"; - sha256 = "0qngw9dw15km09z69hrdlyav89s1kbmmml9791m2iwzk4ckd0yhi"; + version = "0.12.0.4"; + sha256 = "0l27pfsqvil9l4p7hk2bvgxsa35z88179w88wbwvmjf4vsmpiqkh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -113936,7 +114067,6 @@ self: { base directory hedgehog hspec hw-bits hw-hedgehog hw-hspec-hedgehog hw-prim hw-rankselect-base mmap QuickCheck transformers vector ]; - testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ base bytestring conduit criterion directory hw-bits hw-prim hw-rankselect-base mmap resourcet vector @@ -117258,8 +117388,8 @@ self: { }: mkDerivation { pname = "indexation"; - version = "0.3"; - sha256 = "1vrcssb97sds0lddma98p83x52hs9vz4dh5v911idf2f1a22whpp"; + version = "0.4.2"; + sha256 = "1ag30a4xlzii1pwl2dpgc7ydigfh3nw16xwjj2vp2qj54fh0rd1p"; libraryHaskellDepends = [ base bytestring cereal deferred-folds focus hashable potoki potoki-cereal profunctors stm-containers text transformers @@ -122622,8 +122752,8 @@ self: { }: mkDerivation { pname = "juicy-gcode"; - version = "0.1.0.5"; - sha256 = "0gjkch103fisvr35dc86hbfbir76cmwh9cs1ppqlxajspgan9bz1"; + version = "0.1.0.5.1"; + sha256 = "1xdmlgickzg94asqy48ms895prjzyzcn767276f99f7mx9pqb5jr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -128907,8 +129037,8 @@ self: { }: mkDerivation { pname = "liblastfm"; - version = "0.6.0"; - sha256 = "0r6jq4dx2g5qh1gng73vh81kl6bch3ql2fhk3hkmw8ww7rqzf01g"; + version = "0.7.0"; + sha256 = "1ls7zvg14mllih9aj8by739mkvlv80i0aa3z224ij4d7hp3dyd0g"; libraryHaskellDepends = [ aeson base bytestring cereal containers cryptonite http-client http-client-tls network-uri profunctors semigroups text @@ -150090,8 +150220,8 @@ self: { }: mkDerivation { pname = "opaleye-trans"; - version = "0.4.3"; - sha256 = "1gvlsqhjnyyl34b65xbmir99cyrd697vlzki3225z4m0jd66n5bl"; + version = "0.5.0"; + sha256 = "18y9qcs771647g5xy7209rq32w7fqflcr313mdw1fv0m2ak65wb2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -152376,7 +152506,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; - "pandoc_2_2_3" = callPackage + "pandoc_2_2_3_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring , binary, blaze-html, blaze-markup, bytestring, Cabal , case-insensitive, cmark-gfm, containers, criterion, data-default @@ -152391,8 +152521,8 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "2.2.3"; - sha256 = "13x5jrl26bj21zxg6j3igsd3z592ws9nfw46vx9aw220nz0j1rvq"; + version = "2.2.3.2"; + sha256 = "0dmk2vy0kfsi8xzpa8h0kypidf264d5rjvcqyd7jf34rjj47ikk2"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -156137,8 +156267,8 @@ self: { }: mkDerivation { pname = "persistent-migration"; - version = "0.0.2"; - sha256 = "0vnc2jiagb2z11dy428fd47zhixw7ib96aras0lvhjbwyldzic5p"; + version = "0.1.0"; + sha256 = "025hrjm95klj4b7wqlzwkcwra5yj37ilirr06hxxw6d3g668rllm"; libraryHaskellDepends = [ base containers fgl mtl persistent text time unordered-containers ]; @@ -156146,7 +156276,7 @@ self: { base bytestring conduit containers exceptions monad-logger mtl persistent persistent-postgresql persistent-template process QuickCheck resource-pool tasty tasty-golden tasty-quickcheck - temporary text yaml + temporary text time yaml ]; description = "Manual migrations for the persistent library"; license = stdenv.lib.licenses.bsd3; @@ -158771,6 +158901,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "piyo" = callPackage + ({ mkDerivation, base, extra, sdl2, sdl2-gfx, sdl2-image + , sdl2-mixer, sdl2-ttf, text + }: + mkDerivation { + pname = "piyo"; + version = "0.1.0.0"; + sha256 = "168jiqp73kmg797a6njgi792qm2aczgkj77i28m04gah1qhyp603"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base extra sdl2 sdl2-gfx sdl2-image sdl2-mixer sdl2-ttf text + ]; + executableHaskellDepends = [ + base extra sdl2 sdl2-gfx sdl2-image sdl2-mixer sdl2-ttf text + ]; + testHaskellDepends = [ + base extra sdl2 sdl2-gfx sdl2-image sdl2-mixer sdl2-ttf text + ]; + description = "Haskell game engine like fantasy console"; + license = stdenv.lib.licenses.mit; + }) {}; + "pkcs1" = callPackage ({ mkDerivation, base, bytestring, random }: mkDerivation { @@ -161387,16 +161541,22 @@ self: { "potoki-cereal" = callPackage ({ mkDerivation, acquire, attoparsec, base, base-prelude - , bytestring, cereal, potoki-core, text + , bytestring, cereal, directory, potoki, potoki-core, QuickCheck + , quickcheck-instances, rerebase, tasty, tasty-hunit + , tasty-quickcheck, text }: mkDerivation { pname = "potoki-cereal"; - version = "0.3"; - sha256 = "0m7g9dkvzb94iwywf3bil8h57xbs2d3zvgn4d8la54qz5izimszp"; + version = "0.3.0.1"; + sha256 = "0dm5yvh8a8sgrqvgkl48zpn5c8ymz9h83nw44icnhqirg1hrkhvi"; libraryHaskellDepends = [ acquire attoparsec base base-prelude bytestring cereal potoki-core text ]; + testHaskellDepends = [ + directory potoki QuickCheck quickcheck-instances rerebase tasty + tasty-hunit tasty-quickcheck + ]; description = "Streaming serialization"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -162370,6 +162530,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pretty-simple_2_2_0_0" = callPackage + ({ mkDerivation, ansi-terminal, base, criterion, doctest, Glob, mtl + , text, transformers + }: + mkDerivation { + pname = "pretty-simple"; + version = "2.2.0.0"; + sha256 = "0cf7pfx98dq8ykxja7gi2y7zpczj41sqfg4dindm8v5knlv1ppik"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base mtl text transformers + ]; + testHaskellDepends = [ base doctest Glob ]; + benchmarkHaskellDepends = [ base criterion text ]; + description = "pretty printer for data types with a 'Show' instance"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pretty-sop" = callPackage ({ mkDerivation, base, generics-sop, pretty-show }: mkDerivation { @@ -162739,15 +162919,15 @@ self: { }: mkDerivation { pname = "primitive-extras"; - version = "0.6.4"; - sha256 = "1j1zpyirlk162krhjxnryyjdx8gsa686gxrpq67ls9nf1rgkgf67"; + version = "0.6.4.1"; + sha256 = "1b0q2qsd3ma6hg1av63fg0dqya6s61vv7giish9vh14cbz00zr66"; libraryHaskellDepends = [ base bytestring cereal deferred-folds focus foldl primitive profunctors vector ]; testHaskellDepends = [ - deferred-folds focus QuickCheck quickcheck-instances rerebase tasty - tasty-hunit tasty-quickcheck + cereal deferred-folds focus primitive QuickCheck + quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck ]; description = "Extras for the \"primitive\" library"; license = stdenv.lib.licenses.mit; @@ -164036,8 +164216,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "5.4.0"; - sha256 = "1ykzagmw2an1aglkglkpkqv65mxaqqfj7zia27f6npnihb6hwi5v"; + version = "5.4.1"; + sha256 = "13adj770k3awgsdipjkwgfja6b1hkxdphf0aa4jayxm2jz9gkpbd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -164807,8 +164987,8 @@ self: { }: mkDerivation { pname = "ptr"; - version = "0.16.5"; - sha256 = "0hywqysklzy5xixd8wdhrlwzf2336z1kn593sg5q30kbg3b0bgj2"; + version = "0.16.6"; + sha256 = "1makksw42pb6088i3s755q0wyfismfq5avpwbcfvfbzcasn2kncs"; libraryHaskellDepends = [ base base-prelude bug bytestring contravariant mtl profunctors semigroups text time transformers vector @@ -170532,10 +170712,8 @@ self: { }: mkDerivation { pname = "reflex-dom-fragment-shader-canvas"; - version = "0.1"; - sha256 = "1zc8kgny3d467lxpwg5mm1amg6924m5ifkkafyh18nfzqffvc3bl"; - revision = "2"; - editedCabalFile = "1cjp8gzrvwz8qzvfh3s71ng5nklp4y1sarik9m1k47zyd2bm49yl"; + version = "0.1.0.1"; + sha256 = "17b023xjz29n673q4a5bd9r5bj8hb7b1q6ms6qppmwdimk3glz4z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -171876,6 +172054,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "relude_0_1_1" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, doctest + , gauge, ghc-prim, Glob, hashable, hedgehog, mtl, stm, tasty + , tasty-hedgehog, text, transformers, unordered-containers + , utf8-string + }: + mkDerivation { + pname = "relude"; + version = "0.1.1"; + sha256 = "034hldd9rsqqhhxmnpfabh6v2by47qc5kx1qv77bl8k73fybf9a0"; + libraryHaskellDepends = [ + base bytestring containers deepseq ghc-prim hashable mtl stm text + transformers unordered-containers utf8-string + ]; + testHaskellDepends = [ + base bytestring doctest Glob hedgehog tasty tasty-hedgehog text + utf8-string + ]; + benchmarkHaskellDepends = [ + base containers gauge unordered-containers + ]; + description = "Custom prelude from Kowainik"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "remark" = callPackage ({ mkDerivation, base, GenericPretty, tasty, tasty-golden , tasty-hunit @@ -174795,21 +174999,21 @@ self: { "rollbar-hs" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive - , containers, hostname, hspec, hspec-golden-aeson, http-client - , http-conduit, http-types, lens, lens-aeson, network, QuickCheck - , text, time, unordered-containers, uuid + , hostname, hspec, hspec-golden-aeson, http-client, http-conduit + , http-types, network, QuickCheck, text, time, unordered-containers + , uuid }: mkDerivation { pname = "rollbar-hs"; - version = "0.3.0.1"; - sha256 = "1qdhr2xaiwdz2xj0c62wf4zil7407iwd9zf5v6b1fxx38s2kc3wd"; + version = "0.3.1.0"; + sha256 = "1il3rfzf0rmddm3yqsgz6rhyai3m3z6mn3f00irc7955sl320qn8"; libraryHaskellDepends = [ aeson base bytestring case-insensitive hostname http-client http-conduit http-types network text time unordered-containers uuid ]; testHaskellDepends = [ - aeson base bytestring case-insensitive containers hspec - hspec-golden-aeson lens lens-aeson QuickCheck text + aeson base bytestring case-insensitive hspec hspec-golden-aeson + QuickCheck text unordered-containers ]; description = "Core Rollbar data types and APIs"; license = stdenv.lib.licenses.bsd3; @@ -175505,8 +175709,39 @@ self: { pname = "rss-conduit"; version = "0.4.2.2"; sha256 = "1qaz3a9fjq5dqky6jvnnk68xbarrqng7bas9r10qzdpy7g1v17ps"; + revision = "3"; + editedCabalFile = "1fay2p90wx49b2yky0r6x70az3f0c1b2hwy3rzayza8am2i5r0bn"; + libraryHaskellDepends = [ + atom-conduit base conduit conduit-combinators containers + dublincore-xml-conduit lens-simple safe safe-exceptions singletons + text time timerep uri-bytestring vinyl xml-conduit xml-types + ]; + testHaskellDepends = [ + atom-conduit base blaze-builder bytestring conduit + conduit-combinators data-default dublincore-xml-conduit lens-simple + mono-traversable QuickCheck quickcheck-instances resourcet + safe-exceptions singletons tasty tasty-hunit tasty-quickcheck text + time uri-bytestring vinyl xml-conduit xml-types + ]; + description = "Streaming parser/renderer for the RSS standard"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "rss-conduit_0_4_3_0" = callPackage + ({ mkDerivation, atom-conduit, base, blaze-builder, bytestring + , conduit, conduit-combinators, containers, data-default + , dublincore-xml-conduit, lens-simple, mono-traversable, QuickCheck + , quickcheck-instances, resourcet, safe, safe-exceptions + , singletons, tasty, tasty-hunit, tasty-quickcheck, text, time + , timerep, uri-bytestring, vinyl, xml-conduit, xml-types + }: + mkDerivation { + pname = "rss-conduit"; + version = "0.4.3.0"; + sha256 = "003crn6pczr8x3r0j9nkx22gqwq0fvy4mkksmng8vp7qbvycvzvz"; revision = "1"; - editedCabalFile = "1y5f1fvjjljk0rl8payxm9dsazzh2057nq9m9bi4gxwa8lkfz21d"; + editedCabalFile = "0dnp7a1xi344qhdqmr3hsnai7id4d87rll0wsww3wcfh2bh0nm6q"; libraryHaskellDepends = [ atom-conduit base conduit conduit-combinators containers dublincore-xml-conduit lens-simple safe safe-exceptions singletons @@ -177052,6 +177287,33 @@ self: { license = stdenv.lib.licenses.lgpl3; }) {}; + "sbp_2_3_17" = callPackage + ({ mkDerivation, aeson, array, base, base64-bytestring + , basic-prelude, binary, binary-conduit, bytestring, conduit + , conduit-extra, data-binary-ieee754, lens, lens-aeson, monad-loops + , resourcet, tasty, tasty-hunit, template-haskell, text, time, yaml + }: + mkDerivation { + pname = "sbp"; + version = "2.3.17"; + sha256 = "1zwxq0x9g2l2nkyhbsdgz42wsnr1skm99x3vhd7f7azx17kv3lg6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson array base base64-bytestring basic-prelude binary bytestring + data-binary-ieee754 lens lens-aeson monad-loops template-haskell + text + ]; + executableHaskellDepends = [ + aeson base basic-prelude binary-conduit bytestring conduit + conduit-extra resourcet time yaml + ]; + testHaskellDepends = [ base basic-prelude tasty tasty-hunit ]; + description = "SwiftNav's SBP Library"; + license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sbp2udp" = callPackage ({ mkDerivation, base, basic-prelude, binary, binary-conduit , bytestring, conduit, conduit-extra, network, optparse-generic @@ -178900,14 +179162,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "selda_0_3_1_0" = callPackage + "selda_0_3_2_0" = callPackage ({ mkDerivation, base, bytestring, exceptions, hashable, mtl , psqueues, text, time, unordered-containers }: mkDerivation { pname = "selda"; - version = "0.3.1.0"; - sha256 = "13l98d3aihzw5ycfflsp84sk580mdni9mblsmyspqww81xadcdwr"; + version = "0.3.2.0"; + sha256 = "1ngvh7w4s0w57qaizzxin641x9v4v2rm03lnkfcxklq93l3khgp6"; libraryHaskellDepends = [ base bytestring exceptions hashable mtl psqueues text time unordered-containers @@ -178942,8 +179204,8 @@ self: { pname = "selda-postgresql"; version = "0.1.7.3"; sha256 = "0ardh6ds8fmqy09y74nflsb8r5y4cvl2ddxcla0vzaf5xppx4czc"; - revision = "1"; - editedCabalFile = "01kyplz962nmn7r52smy3w81a8zshl4pa9qkphbsda43rrcphn5s"; + revision = "2"; + editedCabalFile = "1zrj412hkjjka4cvl5zj6gdpvdafmcny6xighi1glg67n8cmpb67"; libraryHaskellDepends = [ base bytestring exceptions postgresql-libpq selda text ]; @@ -178977,8 +179239,8 @@ self: { pname = "selda-sqlite"; version = "0.1.6.1"; sha256 = "1qqrgqzcfwqzlcklm0qjvdy3ndn3zg8s5mp8744v76bd6z2xwq4d"; - revision = "1"; - editedCabalFile = "0gyl0apn2bzfw0qk8vx626mrhym8769jq6n0hki6xj60gvqpr6dr"; + revision = "2"; + editedCabalFile = "0gb8raqmy8r8xwjpx238mqar5gdfd4194si2ms1a9ndcrilkkqja"; libraryHaskellDepends = [ base direct-sqlite directory exceptions selda text ]; @@ -179887,30 +180149,28 @@ self: { "serokell-util" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, base16-bytestring - , base64-bytestring, bytestring, clock, containers, deepseq - , directory, exceptions, extra, filepath, fmt, formatting, hashable - , hspec, hspec-discover, lens, log-warper, monad-control, mtl - , o-clock, optparse-applicative, parsec, QuickCheck - , quickcheck-instances, safecopy, scientific, semigroups, stm - , template-haskell, text, text-format, transformers, universum - , unordered-containers, vector, yaml + , base64-bytestring, bytestring, clock, deepseq, exceptions, extra + , fmt, formatting, hashable, hspec, hspec-discover, microlens + , microlens-mtl, mtl, o-clock, parsec, process, QuickCheck + , quickcheck-instances, scientific, template-haskell, text + , th-lift-instances, transformers, universum, unordered-containers + , vector }: mkDerivation { pname = "serokell-util"; - version = "0.8.0"; - sha256 = "0v8vy66pbb37w7vaal42w8z0dld93j3d0bfpp3gc8mkmv12gh49p"; + version = "0.10.0"; + sha256 = "1aa1cjqwkjhbfd9q1lnyp5xiji64swsy2lipj7c83q8xyfxcxq67"; libraryHaskellDepends = [ aeson ansi-terminal base base16-bytestring base64-bytestring - bytestring clock containers deepseq directory exceptions extra - filepath fmt formatting hashable lens log-warper monad-control mtl - o-clock optparse-applicative parsec QuickCheck quickcheck-instances - scientific semigroups stm template-haskell text text-format - transformers universum unordered-containers vector yaml + bytestring clock deepseq exceptions fmt formatting hashable + microlens microlens-mtl mtl o-clock parsec process QuickCheck + quickcheck-instances scientific template-haskell text + th-lift-instances transformers universum unordered-containers + vector ]; testHaskellDepends = [ - aeson base bytestring hspec QuickCheck quickcheck-instances - safecopy scientific text text-format universum unordered-containers - vector + aeson base extra formatting hspec QuickCheck quickcheck-instances + scientific universum unordered-containers vector ]; testToolDepends = [ hspec-discover ]; description = "General-purpose functions by Serokell"; @@ -180557,6 +180817,8 @@ self: { pname = "servant-dhall"; version = "0.1.0.1"; sha256 = "1yriifnflvh4f0vv2mrfv6qw0cv35isrq03q4h43g096ml2wl3ll"; + revision = "1"; + editedCabalFile = "0p8ygb5l79zzawnmy992wnicxv2cbbr0860063mbchmjwjf39x33"; libraryHaskellDepends = [ base base-compat bytestring dhall http-media megaparsec prettyprinter servant text @@ -184579,8 +184841,8 @@ self: { }: mkDerivation { pname = "simple-log"; - version = "0.9.5"; - sha256 = "042mnsc2mfxdsf49knszk732mj5ryd9309h9ysyzb6z0y9wnp736"; + version = "0.9.6"; + sha256 = "0cbzc5ib63x2m4xz88ks6xfg99c2plp2y6y7bzx3i3rrhd3y1pjn"; libraryHaskellDepends = [ async base base-unicode-symbols containers data-default deepseq directory exceptions filepath hformat microlens microlens-platform @@ -187122,6 +187384,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "snap-stream" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, io-streams + , snap-core + }: + mkDerivation { + pname = "snap-stream"; + version = "0.1"; + sha256 = "0f8ai7ys7wb4aa9l7hn7zmdj1byia5s7nnnr1gvq8xwlkapr15w3"; + libraryHaskellDepends = [ + attoparsec base bytestring io-streams snap-core + ]; + description = "Streaming Snap handlers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "snap-templates" = callPackage ({ mkDerivation, base, bytestring, containers, directory , directory-tree, filepath, hashable, old-time, template-haskell @@ -200113,23 +200390,26 @@ self: { "termonad" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, classy-prelude, colour - , constraints, data-default, doctest, dyre, gi-gdk, gi-gio, gi-glib - , gi-gtk, gi-pango, gi-vte, haskell-gi-base, hedgehog, lens - , pretty-simple, QuickCheck, tasty, tasty-hedgehog - , template-haskell, xml-conduit, xml-html-qq + , constraints, data-default, directory, doctest, dyre, filepath + , gi-gdk, gi-gio, gi-glib, gi-gtk, gi-pango, gi-vte, gtk3 + , haskell-gi-base, hedgehog, lens, pretty-simple, QuickCheck, tasty + , tasty-hedgehog, template-haskell, xml-conduit, xml-html-qq }: mkDerivation { pname = "termonad"; - version = "0.1.0.0"; - sha256 = "0fbk1q75c60ifmb348iic9mhh30mx1544k9ghdi2wcqpgipvrfab"; + version = "0.2.0.0"; + sha256 = "0y5f4k6f2cs6x7p8qrfi7nwy46arap8v87algxg3iixw30c325lc"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - base classy-prelude colour constraints data-default dyre gi-gdk - gi-gio gi-glib gi-gtk gi-pango gi-vte haskell-gi-base lens - pretty-simple QuickCheck xml-conduit xml-html-qq + base classy-prelude colour constraints data-default directory dyre + filepath gi-gdk gi-gio gi-glib gi-gtk gi-pango gi-vte + haskell-gi-base lens pretty-simple QuickCheck xml-conduit + xml-html-qq ]; + libraryPkgconfigDepends = [ gtk3 ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base doctest hedgehog lens QuickCheck tasty tasty-hedgehog @@ -200138,7 +200418,7 @@ self: { description = "Terminal emulator configurable in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) {gtk3 = pkgs.gnome3.gtk;}; "termplot" = callPackage ({ mkDerivation, base, brick, data-default, optparse-applicative @@ -202178,8 +202458,8 @@ self: { ({ mkDerivation, base, lens, pretty, template-haskell }: mkDerivation { pname = "th-pprint"; - version = "0.1.0.0"; - sha256 = "0i9c20q6pfn0bl3l2hj8lgzfmj04i19xlbkfl1ac3vr9ikq91q01"; + version = "0.2.0.0"; + sha256 = "1c6h6jw82a8bdb8kqxcam63vbrz04dl8m2ypcmfw5qm88b61zl1f"; libraryHaskellDepends = [ base lens pretty template-haskell ]; description = "Simplify and render Template Haskell"; license = stdenv.lib.licenses.bsd3; @@ -205415,6 +205695,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "traction" = callPackage + ({ mkDerivation, base, bytestring, containers, exceptions, hedgehog + , mmorph, postgresql-simple, resource-pool, syb, template-haskell + , text, time, transformers, transformers-either + }: + mkDerivation { + pname = "traction"; + version = "0.0.1"; + sha256 = "15sl663zk2fys3f5r5vizazid64ij2kwya2p8yk3gyhmnklccqmn"; + libraryHaskellDepends = [ + base bytestring containers exceptions mmorph postgresql-simple + resource-pool syb template-haskell text time transformers + transformers-either + ]; + testHaskellDepends = [ + base hedgehog mmorph postgresql-simple resource-pool text + ]; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tracy" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -213785,6 +214085,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "viewprof_0_0_0_22" = callPackage + ({ mkDerivation, base, brick, containers, directory, ghc-prof, lens + , scientific, text, vector, vector-algorithms, vty + }: + mkDerivation { + pname = "viewprof"; + version = "0.0.0.22"; + sha256 = "07sa15nrwdjyzqmzvrdvl0nggdx5ca6w7qijhv7na9ivr0p2h495"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base brick containers directory ghc-prof lens scientific text + vector vector-algorithms vty + ]; + description = "Text-based interactive GHC .prof viewer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "views" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -213936,15 +214255,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "vinyl_0_9_1" = callPackage + "vinyl_0_9_3" = callPackage ({ mkDerivation, array, base, criterion, doctest, ghc-prim, hspec , lens, linear, microlens, mwc-random, primitive , should-not-typecheck, singletons, tagged, vector }: mkDerivation { pname = "vinyl"; - version = "0.9.1"; - sha256 = "1za62xg5zf3m0nil73k7l6jmridf3sccv29psp3hdqi3y62fjggp"; + version = "0.9.3"; + sha256 = "1sxkkmnq7vl5bmpljs3riaqb2kqpx1kkkllqiz4zawmhw6wmw1nj"; libraryHaskellDepends = [ array base ghc-prim ]; testHaskellDepends = [ base doctest hspec lens microlens should-not-typecheck singletons @@ -225044,6 +225363,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-websockets_0_3_0_1" = callPackage + ({ mkDerivation, base, conduit, mtl, transformers, unliftio + , wai-websockets, websockets, yesod-core + }: + mkDerivation { + pname = "yesod-websockets"; + version = "0.3.0.1"; + sha256 = "1k41qglb5fdzykyfpml4w74cg2m95ggm2jrnqy7bkj2l0fm4gjc6"; + libraryHaskellDepends = [ + base conduit mtl transformers unliftio wai-websockets websockets + yesod-core + ]; + description = "WebSockets support for Yesod"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-websockets-extra" = callPackage ({ mkDerivation, base, enclosed-exceptions, transformers , websockets, yesod-websockets @@ -227086,6 +227422,8 @@ self: { pname = "ztail"; version = "1.2.0.2"; sha256 = "05vpq3kiv1xrby2k1qn41s42cxxxblcgxpnw1sgyznx63pal2hx1"; + revision = "1"; + editedCabalFile = "0d0cpgb0v849zxl12c2gkm3x4nmyfycka1pcfix43lawx62rky8s"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 95dac230cc556..3f339030de559 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -159,6 +159,13 @@ let # Generated from ${src} ${orig.preConfigure or ""} ''; + passthru = orig.passthru or {} // { + # When using callCabal2nix or callHackage, it is often useful + # to debug a failure by inspecting the Nix expression + # generated by cabal2nix. This can be accessed via this + # cabal2nixDeriver field. + cabal2nixDeriver = src; + }; }); in package-set { inherit pkgs stdenv callPackage; } self // { diff --git a/pkgs/development/interpreters/jimtcl/default.nix b/pkgs/development/interpreters/jimtcl/default.nix index 3bef4996a4ccb..704e3eb4031a5 100644 --- a/pkgs/development/interpreters/jimtcl/default.nix +++ b/pkgs/development/interpreters/jimtcl/default.nix @@ -5,13 +5,13 @@ let in stdenv.mkDerivation rec { name = "jimtcl-${version}"; - version = "0.77"; + version = "0.78"; src = fetchFromGitHub { owner = "msteveb"; repo = "jimtcl"; rev = version; - sha256 = "06d9gdgvi6cwd6pjg3xig0kkjqm6kgq3am8yq1xnksyz2n09f0kp"; + sha256 = "1nrjxjfh69i35ig8sxdlal4ydd3cl0x68c05s6svnf1y2i1bl23j"; }; buildInputs = [ diff --git a/pkgs/development/interpreters/pyrex/0.9.5.nix b/pkgs/development/interpreters/pyrex/0.9.5.nix index be11b38a0b83a..009f9b48ea4e4 100644 --- a/pkgs/development/interpreters/pyrex/0.9.5.nix +++ b/pkgs/development/interpreters/pyrex/0.9.5.nix @@ -1,4 +1,4 @@ -{ fetchurl, python2Packages }: +{ stdenv, fetchurl, python2Packages }: let version = "0.9.5.1.1"; in @@ -15,5 +15,6 @@ python2Packages.buildPythonPackage rec { meta = { homepage = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/; description = "A language for writing Python extension modules"; + license = stdenv.lib.licenses.asl20; }; } diff --git a/pkgs/development/interpreters/pyrex/0.9.6.nix b/pkgs/development/interpreters/pyrex/0.9.6.nix index 2a18dbff9e6eb..d79cd58c1598d 100644 --- a/pkgs/development/interpreters/pyrex/0.9.6.nix +++ b/pkgs/development/interpreters/pyrex/0.9.6.nix @@ -1,4 +1,4 @@ -{ fetchurl, python2Packages }: +{ stdenv, fetchurl, python2Packages }: let version = "0.9.6.4"; in @@ -15,5 +15,6 @@ python2Packages.buildPythonPackage rec { meta = { homepage = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/; description = "A language for writing Python extension modules"; + license = stdenv.lib.licenses.asl20; }; } diff --git a/pkgs/development/interpreters/scheme48/default.nix b/pkgs/development/interpreters/scheme48/default.nix index 1bfe812410481..e01aef98303c6 100644 --- a/pkgs/development/interpreters/scheme48/default.nix +++ b/pkgs/development/interpreters/scheme48/default.nix @@ -8,6 +8,7 @@ stdenv.mkDerivation { description = "Scheme 48"; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; platforms = with stdenv.lib.platforms; unix; + license = stdenv.lib.licenses.bsd3; }; src = fetchurl { diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index 096ac80e5a70a..d62e22fe0e005 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/pkgs/development/libraries/aspell/dictionaries.nix @@ -109,110 +109,110 @@ in rec { ### Languages - ca = buildDict { + ca = buildDict rec { shortName = "ca-2.1.5-1"; fullName = "Catalan"; src = fetchurl { - url = mirror://gnu/aspell/dict/ca/aspell6-ca-2.1.5-1.tar.bz2; + url = "mirror://gnu/aspell/dict/ca/aspell6-${shortName}.tar.bz2"; sha256 = "1fb5y5kgvk25nlsfvc8cai978hg66x3pbp9py56pldc7vxzf9npb"; }; }; - cs = buildDict { + cs = buildDict rec { shortName = "cs-20040614-1"; fullName = "Czech"; src = fetchurl { - url = mirror://gnu/aspell/dict/cs/aspell6-cs-20040614-1.tar.bz2; + url = "mirror://gnu/aspell/dict/cs/aspell6-${shortName}.tar.bz2"; sha256 = "0rihj4hsw96pd9casvmpvw3r8040pfa28p1h73x4vyn20zwr3h01"; }; }; - da = buildDict { + da = buildDict rec { shortName = "da-1.4.42-1"; fullName = "Danish"; src = fetchurl { - url = mirror://gnu/aspell/dict/da/aspell5-da-1.4.42-1.tar.bz2; + url = "mirror://gnu/aspell/dict/da/aspell5-${shortName}.tar.bz2"; sha256 = "1hfkmiyhgrx5lgrb2mffjbdn1hivrm73wcg7x0iid74p2yb0fjpp"; }; }; - de = buildDict { + de = buildDict rec { shortName = "de-20030222-1"; fullName = "German"; src = fetchurl { - url = mirror://gnu/aspell/dict/de/aspell6-de-20030222-1.tar.bz2; + url = "mirror://gnu/aspell/dict/de/aspell6-${shortName}.tar.bz2"; sha256 = "01p92qj66cqb346gk7hjfynaap5sbcn85xz07kjfdq623ghr8v5s"; }; }; - en = buildDict { + en = buildDict rec { shortName = "en-2016.06.26-0"; fullName = "English"; src = fetchurl { - url = mirror://gnu/aspell/dict/en/aspell6-en-2016.06.26-0.tar.bz2; + url = "mirror://gnu/aspell/dict/en/aspell6-${shortName}.tar.bz2"; sha256 = "1clzsfq2cbgp6wvfr2qwfsd2nziipml5m5vqm45r748wczlxihv1"; }; }; - es = buildDict { + es = buildDict rec { shortName = "es-1.11-2"; fullName = "Spanish"; src = fetchurl { - url = mirror://gnu/aspell/dict/es/aspell6-es-1.11-2.tar.bz2; + url = "mirror://gnu/aspell/dict/es/aspell6-${shortName}.tar.bz2"; sha256 = "1k5g328ac1hdpp6fsg57d8md6i0aqcwlszp3gbmp5706wyhpydmd"; }; }; - eo = buildDict { + eo = buildDict rec { shortName = "eo-2.1.20000225a-2"; fullName = "Esperanto"; src = fetchurl { - url = mirror://gnu/aspell/dict/eo/aspell6-eo-2.1.20000225a-2.tar.bz2; + url = "mirror://gnu/aspell/dict/eo/aspell6-${shortName}.tar.bz2"; sha256 = "09vf0mbiicbmyb4bwb7v7lgpabnylg0wy7m3hlhl5rjdda6x3lj1"; }; }; - fr = buildDict { + fr = buildDict rec { shortName = "fr-0.50-3"; fullName = "French"; src = fetchurl { - url = mirror://gnu/aspell/dict/fr/aspell-fr-0.50-3.tar.bz2; + url = "mirror://gnu/aspell/dict/fr/aspell-${shortName}.tar.bz2"; sha256 = "14ffy9mn5jqqpp437kannc3559bfdrpk7r36ljkzjalxa53i0hpr"; }; }; - it = buildDict { + it = buildDict rec { shortName = "it-2.2_20050523-0"; fullName = "Italian"; src = fetchurl { - url = mirror://gnu/aspell/dict/it/aspell6-it-2.2_20050523-0.tar.bz2; + url = "mirror://gnu/aspell/dict/it/aspell6-${shortName}.tar.bz2"; sha256 = "1gdf7bc1a0kmxsmphdqq8pl01h667mjsj6hihy6kqy14k5qdq69v"; }; }; - la = buildDict { + la = buildDict rec { shortName = "la-20020503-0"; fullName = "Latin"; src = fetchurl { - url = mirror://gnu/aspell/dict/la/aspell6-la-20020503-0.tar.bz2; + url = "mirror://gnu/aspell/dict/la/aspell6-${shortName}.tar.bz2"; sha256 = "1199inwi16dznzl087v4skn66fl7h555hi2palx6s1f3s54b11nl"; }; }; - nb = buildDict { + nb = buildDict rec { shortName = "nb-0.50.1-0"; fullName = "Norwegian Bokmal"; src = fetchurl { - url = "mirror://gnu/aspell/dict/nb/aspell-nb-0.50.1-0.tar.bz2"; + url = "mirror://gnu/aspell/dict/nb/aspell-${shortName}.tar.bz2"; sha256 = "12i2bmgdnlkzfinb20j2a0j4a20q91a9j8qpq5vgabbvc65nwx77"; }; }; - nl = buildDict { + nl = buildDict rec { shortName = "nl-0.50-2"; fullName = "Dutch"; src = fetchurl { - url = mirror://gnu/aspell/dict/nl/aspell-nl-0.50-2.tar.bz2; + url = "mirror://gnu/aspell/dict/nl/aspell-${shortName}.tar.bz2"; sha256 = "0ffb87yjsh211hllpc4b9khqqrblial4pzi1h9r3v465z1yhn3j4"; }; # Emacs expects a language called "nederlands". @@ -221,92 +221,92 @@ in rec { ''; }; - nn = buildDict { - shortName = "nn-0.50.1-0"; + nn = buildDict rec { + shortName = "nn-0.50.1-1"; fullName = "Norwegian Nynorsk"; src = fetchurl { - url = "mirror://gnu/aspell/dict/nn/aspell-nn-0.50.1-1.tar.bz2"; + url = "mirror://gnu/aspell/dict/nn/aspell-${shortName}.tar.bz2"; sha256 = "0w2k5l5rbqpliripgqwiqixz5ghnjf7i9ggbrc4ly4vy1ia10rmc"; }; }; - pl = buildDict { + pl = buildDict rec { shortName = "pl-6.0_20061121-0"; fullName = "Polish"; src = fetchurl { - url = mirror://gnu/aspell/dict/pl/aspell6-pl-6.0_20061121-0.tar.bz2; + url = "mirror://gnu/aspell/dict/pl/aspell6-${shortName}.tar.bz2"; sha256 = "0kap4kh6bqbb22ypja1m5z3krc06vv4n0hakiiqmv20anzy42xq1"; }; }; - pt_BR = buildDict { - shortName = "pt_BR-20090702"; + pt_BR = buildDict rec { + shortName = "pt_BR-20090702-0"; fullName = "Brazilian Portuguese"; src = fetchurl { - url = mirror://gnu/aspell/dict/pt_BR/aspell6-pt_BR-20090702-0.tar.bz2; + url = "mirror://gnu/aspell/dict/pt_BR/aspell6-${shortName}.tar.bz2"; sha256 = "1y09lx9zf2rnp55r16b2vgj953l3538z1vaqgflg9mdvm555bz3p"; }; }; - pt_PT = buildDict { - shortName = "pt_PT-20070510"; + pt_PT = buildDict rec { + shortName = "pt_PT-20070510-0"; fullName = "Portuguese"; src = fetchurl { - url = mirror://gnu/aspell/dict/pt_PT/aspell6-pt_PT-20070510-0.tar.bz2; + url = "mirror://gnu/aspell/dict/pt_PT/aspell6-${shortName}.tar.bz2"; sha256 = "1mnr994cwlag6shy8865ky99lymysiln07mbldcncahg90dagdxq"; }; }; - ro = buildDict { + ro = buildDict rec { shortName = "ro-3.3-2"; fullName = "Romanian"; src = fetchurl { - url = mirror://gnu/aspell/dict/ro/aspell5-ro-3.3-2.tar.bz2; + url = "mirror://gnu/aspell/dict/ro/aspell5-${shortName}.tar.bz2"; sha256 = "0gb8j9iy1acdl11jq76idgc2lbc1rq3w04favn8cyh55d1v8phsk"; }; }; - ru = buildDict { + ru = buildDict rec { shortName = "ru-0.99f7-1"; fullName = "Russian"; src = fetchurl { - url = mirror://gnu/aspell/dict/ru/aspell6-ru-0.99f7-1.tar.bz2; + url = "mirror://gnu/aspell/dict/ru/aspell6-${shortName}.tar.bz2"; sha256 = "0ip6nq43hcr7vvzbv4lwwmlwgfa60hrhsldh9xy3zg2prv6bcaaw"; }; }; - sv = buildDict { + sv = buildDict rec { shortName = "sv-0.51-0"; fullName = "Swedish"; src = fetchurl { - url = mirror://gnu/aspell/dict/sv/aspell-sv-0.51-0.tar.bz2; + url = "mirror://gnu/aspell/dict/sv/aspell-${shortName}.tar.bz2"; sha256 = "02jwkjhr32kvyibnyzgx3smbnm576jwdzg3avdf6zxwckhy5fw4v"; }; }; - sk = buildDict { + sk = buildDict rec { shortName = "sk-2.01-2"; fullName = "Slovak"; src = fetchurl { - url = mirror://gnu/aspell/dict/sk/aspell6-sk-2.01-2.tar.bz2; + url = "mirror://gnu/aspell/dict/sk/aspell6-${shortName}.tar.bz2"; sha256 = "19k0m1v5pcf7xr4lxgjkzqkdlks8nyb13bvi1n7521f3i4lhma66"; }; }; - tr = buildDict { + tr = buildDict rec { shortName = "tr-0.50-0"; fullName = "Turkish"; src = fetchurl { - url = mirror://gnu/aspell/dict/tr/aspell-tr-0.50-0.tar.bz2; + url = "mirror://gnu/aspell/dict/tr/aspell-${shortName}.tar.bz2"; sha256 = "0jpvpm96ga7s7rmsm6rbyrrr22b2dicxv2hy7ysv5y7bbq757ihb"; }; }; - uk = buildDict { + uk = buildDict rec { shortName = "uk-1.4.0-0"; fullName = "Ukrainian"; src = fetchurl { - url = mirror://gnu/aspell/dict/uk/aspell6-uk-1.4.0-0.tar.bz2; + url = "mirror://gnu/aspell/dict/uk/aspell6-${shortName}.tar.bz2"; sha256 = "137i4njvnslab6l4s291s11xijr5jsy75lbdph32f9y183lagy9m"; }; }; diff --git a/pkgs/development/libraries/beecrypt/default.nix b/pkgs/development/libraries/beecrypt/default.nix index 238901e2ec4ff..d7d6ef5451639 100644 --- a/pkgs/development/libraries/beecrypt/default.nix +++ b/pkgs/development/libraries/beecrypt/default.nix @@ -11,5 +11,6 @@ stdenv.mkDerivation { meta = { platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix index 6f9b94fc872b3..a22437d3993e7 100644 --- a/pkgs/development/libraries/c-ares/default.nix +++ b/pkgs/development/libraries/c-ares/default.nix @@ -9,6 +9,15 @@ stdenv.mkDerivation rec { sha256 = "0vnwmbvymw677k780kpb6sb8i3szdp89rzy8mz1fwg1657yw3ls5"; }; + # ares_android.h header is missing + # see issue https://github.com/c-ares/c-ares/issues/216 + postPatch = if stdenv.hostPlatform.isAndroid then '' + cp ${fetchurl { + url = "https://raw.githubusercontent.com/c-ares/c-ares/cares-1_14_0/ares_android.h"; + sha256 = "1aw8y6r5c8zq6grjwf4mcm2jj35r5kgdklrp296214s1f1827ps8"; + }} ares_android.h + '' else null; + meta = with stdenv.lib; { description = "A C library for asynchronous DNS requests"; homepage = https://c-ares.haxx.se; diff --git a/pkgs/development/libraries/c-blosc/default.nix b/pkgs/development/libraries/c-blosc/default.nix index 3793b70de4b50..c52d7c2756dc3 100644 --- a/pkgs/development/libraries/c-blosc/default.nix +++ b/pkgs/development/libraries/c-blosc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "c-blosc-${version}"; - version = "1.14.3"; + version = "1.14.4"; src = fetchFromGitHub { owner = "Blosc"; repo = "c-blosc"; rev = "v${version}"; - sha256 = "051x2hh0yq1zhiyjmiarvc2radi59v03vzs2sa4hmgfhfaxcklld"; + sha256 = "195w96gl75mkxxqq6qjsmb2s1lq8z95qlc71fr5a7sckslcwglh0"; }; buildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index f573a275aaab7..c26a2a20a8141 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { homepage = http://www.exiv2.org/; description = "A library and command-line utility to manage image metadata"; platforms = platforms.all; - license = licenses.gpl2; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 434e13dda895a..f6d8cd6fa4c23 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, fetchpatch, unzip, libjpeg, libtiff, zlib , postgresql, mysql, libgeotiff, pythonPackages, proj, geos, openssl -, libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib +, libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat , libiconv -, netcdfSupport ? true, netcdf, hdf5 , curl +, netcdfSupport ? true, netcdf, hdf5, curl }: with stdenv.lib; @@ -17,12 +17,13 @@ stdenv.mkDerivation rec { }; buildInputs = [ unzip libjpeg libtiff libpng proj openssl sqlite - libspatialite poppler hdf4 qhull giflib ] + libspatialite poppler hdf4 qhull giflib expat ] ++ (with pythonPackages; [ python numpy wrapPython ]) ++ stdenv.lib.optional stdenv.isDarwin libiconv ++ stdenv.lib.optionals netcdfSupport [ netcdf hdf5 curl ]; configureFlags = [ + "--with-expat=${expat.dev}" "--with-jpeg=${libjpeg.dev}" "--with-libtiff=${libtiff.dev}" # optional (without largetiff support) "--with-png=${libpng.dev}" # optional diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index 83030a7a01422..c1b4c88aa4799 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "geos-3.6.2"; + name = "geos-3.6.3"; src = fetchurl { url = "https://download.osgeo.org/geos/${name}.tar.bz2"; - sha256 = "0ak5szby29l9l0vy43dm5z2g92xzdky20q1gc1kah1fnhkgi6nh4"; + sha256 = "0jrypv61rbyp7vi9qpnnaiigjj8cgdqvyk8ymik8h1ppcw5am7mb"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/java/smack/default.nix b/pkgs/development/libraries/java/smack/default.nix index c39478e590ddf..e28925c65bb28 100644 --- a/pkgs/development/libraries/java/smack/default.nix +++ b/pkgs/development/libraries/java/smack/default.nix @@ -11,5 +11,6 @@ stdenv.mkDerivation { meta = { platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.asl20; }; } diff --git a/pkgs/development/libraries/libbluedevil/default.nix b/pkgs/development/libraries/libbluedevil/default.nix index d2e4fe90d2cf4..d8f2426e477bc 100644 --- a/pkgs/development/libraries/libbluedevil/default.nix +++ b/pkgs/development/libraries/libbluedevil/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/libcdaudio/default.nix b/pkgs/development/libraries/libcdaudio/default.nix index 5ae17fe78f057..218eaeea571a4 100644 --- a/pkgs/development/libraries/libcdaudio/default.nix +++ b/pkgs/development/libraries/libcdaudio/default.nix @@ -9,5 +9,6 @@ stdenv.mkDerivation { meta = { platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix index 01452e2d6f59a..5e46f4dc699d2 100644 --- a/pkgs/development/libraries/libcdr/default.nix +++ b/pkgs/development/libraries/libcdr/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { description = "A library providing ability to interpret and import Corel Draw drawings into various applications"; homepage = http://www.freedesktop.org/wiki/Software/libcdr; platforms = stdenv.lib.platforms.all; + license = stdenv.lib.licenses.mpl20; }; } diff --git a/pkgs/development/libraries/libdigidoc/default.nix b/pkgs/development/libraries/libdigidoc/default.nix index f8d896bda3768..7fe7319ff15ee 100644 --- a/pkgs/development/libraries/libdigidoc/default.nix +++ b/pkgs/development/libraries/libdigidoc/default.nix @@ -2,22 +2,18 @@ stdenv.mkDerivation rec { - version = "3.10.1.1212"; + version = "3.10.4"; name = "libdigidoc-${version}"; - + src = fetchurl { - url = "https://installer.id.ee/media/ubuntu/pool/main/libd/libdigidoc/libdigidoc_3.10.1.1212.orig.tar.xz"; - sha256 = "ad5e0603aea2e02977f17318cc93a53c3a19a815e57b2347d97136d11c110807"; + url = "https://github.com/open-eid/libdigidoc/releases/download/v${version}/libdigidoc-${version}.tar.gz"; + sha256 = "0w5wsaj2a5wss1r9j39bfsrkp3xz0w3v1gnr190v6k7l74l453w1"; }; - unpackPhase = '' - mkdir src - tar xf $src -C src - cd src - ''; + nativeBuildInputs = [ cmake ]; + + buildInputs = [ openssl pcsclite opensc libxml2 ]; - buildInputs = [ cmake openssl pcsclite opensc libxml2 ]; - meta = with stdenv.lib; { description = "Library for creating DigiDoc signature files"; homepage = http://www.id.ee/; diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix index 6ff8a03175e81..3df820bc12631 100644 --- a/pkgs/development/libraries/libdigidocpp/default.nix +++ b/pkgs/development/libraries/libdigidocpp/default.nix @@ -1,26 +1,22 @@ { stdenv, fetchurl, cmake, libdigidoc, minizip, pcsclite, opensc, openssl -, xercesc, xml-security-c, pkgconfig, xsd, zlib, vim }: +, xercesc, xml-security-c, pkgconfig, xsd, zlib, xalanc, xxd }: stdenv.mkDerivation rec { - - version = "3.13.3.1365"; + version = "3.13.6"; name = "libdigidocpp-${version}"; src = fetchurl { - url = "https://installer.id.ee/media/ubuntu/pool/main/libd/libdigidocpp/libdigidocpp_3.13.3.1365.orig.tar.xz"; - sha256 = "1xmvjh5xzspm6ja8hz6bzblwly7yn2jni2m6kx8ny9g65zjrj2iw"; + url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz"; + sha256 = "1sdrj7664737k3kbnj2xrnilnx5ifj8hg42z8pxagb0j81x0pnqj"; }; - unpackPhase = '' - mkdir src - tar xf $src -C src - cd src - ''; + nativeBuildInputs = [ cmake pkgconfig xxd ]; + + buildInputs = [ + libdigidoc minizip pcsclite opensc openssl xercesc + xml-security-c xsd zlib xalanc + ]; - buildInputs = [ cmake libdigidoc minizip pcsclite opensc openssl xercesc - xml-security-c pkgconfig xsd zlib vim - ]; - meta = with stdenv.lib; { description = "Library for creating DigiDoc signature files"; homepage = http://www.id.ee/; diff --git a/pkgs/development/libraries/libdmtx/default.nix b/pkgs/development/libraries/libdmtx/default.nix index 390bb4ea9e45f..f5248dfc79e6a 100644 --- a/pkgs/development/libraries/libdmtx/default.nix +++ b/pkgs/development/libraries/libdmtx/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { homepage = http://libdmtx.org; platforms = stdenv.lib.platforms.all; maintainers = [ ]; + license = stdenv.lib.licenses.bsd2; }; } diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix index e76308d22acb6..d043820aa0836 100644 --- a/pkgs/development/libraries/libdwarf/default.nix +++ b/pkgs/development/libraries/libdwarf/default.nix @@ -12,6 +12,7 @@ let meta = { homepage = https://www.prevanders.net/dwarf.html; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.lgpl21Plus; }; in rec { diff --git a/pkgs/development/libraries/libee/default.nix b/pkgs/development/libraries/libee/default.nix index 7eb5df4c7ecbc..7255b3fece425 100644 --- a/pkgs/development/libraries/libee/default.nix +++ b/pkgs/development/libraries/libee/default.nix @@ -14,5 +14,6 @@ stdenv.mkDerivation { homepage = http://www.libee.org/; description = "An Event Expression Library inspired by CEE"; platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.lgpl21Plus; }; } diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix index dffb9053605d0..78c0fd6fb26cd 100644 --- a/pkgs/development/libraries/libinfinity/default.nix +++ b/pkgs/development/libraries/libinfinity/default.nix @@ -1,51 +1,53 @@ { gtkWidgets ? false # build GTK widgets for libinfinity -, daemon ? false # build infinote daemon -, documentation ? false # build documentation , avahiSupport ? false # build support for Avahi in libinfinity , stdenv, fetchurl, pkgconfig, glib, libxml2, gnutls, gsasl -, gtk2 ? null, gtkdoc ? null, avahi ? null, libdaemon ? null, libidn, gss +, gobjectIntrospection +, gtk3 ? null, gtk-doc, docbook_xsl, docbook_xml_dtd_412, avahi ? null, libdaemon, libidn, gss , libintl }: -let - optional = cond: elem: assert cond -> elem != null; if cond then [elem] else []; - -in stdenv.mkDerivation rec { - - name = "libinfinity-${version}"; - version = "0.7.1"; - src = fetchurl { - url = "http://releases.0x539.de/libinfinity/${name}.tar.gz"; - sha256 = "1jw2fhrcbpyz99bij07iyhy9ffyqdn87vl8cb1qz897y3f2f0vk2"; - }; +assert avahiSupport -> avahi != null; +assert gtkWidgets -> gtk3 != null; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib libxml2 gsasl libidn gss libintl ] - ++ optional gtkWidgets gtk2 - ++ optional documentation gtkdoc - ++ optional avahiSupport avahi - ++ optional daemon libdaemon; - - propagatedBuildInputs = [ gnutls ]; - - configureFlags = [ - (stdenv.lib.enableFeature documentation "gtk-doc") - (stdenv.lib.withFeature gtkWidgets "inftextgtk") - (stdenv.lib.withFeature gtkWidgets "infgtk") - (stdenv.lib.withFeature daemon "infinoted") - (stdenv.lib.withFeature daemon "libdaemon") - (stdenv.lib.withFeature avahiSupport "avahi") - ]; - - passthru = { - inherit version; - }; - - meta = { - homepage = http://gobby.0x539.de/; - description = "An implementation of the Infinote protocol written in GObject-based C"; - license = stdenv.lib.licenses.lgpl2Plus; - maintainers = [ stdenv.lib.maintainers.phreedom ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; +let + mkFlag = flag: feature: (if flag then "--with-" else "--without-") + feature; + + self = stdenv.mkDerivation rec { + name = "libinfinity-${version}"; + version = "0.7.1"; + src = fetchurl { + url = "http://releases.0x539.de/libinfinity/${name}.tar.gz"; + sha256 = "1jw2fhrcbpyz99bij07iyhy9ffyqdn87vl8cb1qz897y3f2f0vk2"; + }; + + outputs = [ "bin" "out" "dev" "man" "devdoc" ]; + + nativeBuildInputs = [ pkgconfig gtk-doc docbook_xsl docbook_xml_dtd_412 gobjectIntrospection ]; + buildInputs = [ glib libxml2 gsasl libidn gss libintl libdaemon ] + ++ stdenv.lib.optional gtkWidgets gtk3 + ++ stdenv.lib.optional avahiSupport avahi; + + propagatedBuildInputs = [ gnutls ]; + + configureFlags = [ + "--enable-gtk-doc" + "--enable-introspection" + (mkFlag gtkWidgets "inftextgtk") + (mkFlag gtkWidgets "infgtk") + "--with-infinoted" + "--with-libdaemon" + (mkFlag avahiSupport "avahi") + ]; + + passthru = { + infinoted = "${self.bin}/bin/infinoted-${stdenv.lib.versions.majorMinor version}"; + }; + + meta = { + homepage = http://gobby.0x539.de/; + description = "An implementation of the Infinote protocol written in GObject-based C"; + license = stdenv.lib.licenses.lgpl2Plus; + maintainers = [ stdenv.lib.maintainers.phreedom ]; + platforms = with stdenv.lib.platforms; linux ++ darwin; + }; }; - -} +in self diff --git a/pkgs/development/libraries/libinotify-kqueue/default.nix b/pkgs/development/libraries/libinotify-kqueue/default.nix new file mode 100644 index 0000000000000..6fc507daf6410 --- /dev/null +++ b/pkgs/development/libraries/libinotify-kqueue/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchzip, autoreconfHook }: + +stdenv.mkDerivation rec { + name = "libinotify-kqueue-${version}"; + version = "20180201"; + + src = fetchzip { + url = "https://github.com/libinotify-kqueue/libinotify-kqueue/archive/${version}.tar.gz"; + sha256 = "0dkh6n0ghhcl7cjkjmpin118h7al6i4vlkmw57vip5f6ngr6q3pl"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + doCheck = true; + checkFlags = [ "test" ]; + + meta = with stdenv.lib; { + description = "Inotify shim for macOS and BSD"; + homepage = https://github.com/libinotify-kqueue/libinotify-kqueue; + license = licenses.mit; + maintainers = with maintainers; [ yegortimoshenko ]; + platforms = with platforms; darwin ++ freebsd ++ netbsd ++ openbsd; + }; +} diff --git a/pkgs/development/libraries/libsixel/default.nix b/pkgs/development/libraries/libsixel/default.nix index bad5e7c596222..34d959423a36a 100644 --- a/pkgs/development/libraries/libsixel/default.nix +++ b/pkgs/development/libraries/libsixel/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchFromGitHub}: stdenv.mkDerivation rec { - version = "1.8.1"; + version = "1.8.2"; name = "libsixel-${version}"; src = fetchFromGitHub { repo = "libsixel"; rev = "v${version}"; owner = "saitoha"; - sha256 = "0cbhvd1yk0q08nxva5bga7bpp8yxjfdfnqicvip4l6k28mzz7pmf"; + sha256 = "1jn5z2ylccjkp9i12n5x53x2zzhhsgmgs6xxi7aja6qimfw90h1n"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index 408436ca61844..9b5c3d530ebf0 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, cmake, zlib, openssl, libsodium }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, cmake, zlib, openssl, libsodium }: stdenv.mkDerivation rec { name = "libssh-0.7.5"; @@ -8,6 +8,16 @@ stdenv.mkDerivation rec { sha256 = "15bh6dm9c50ndddzh3gqcgw7axp3ghrspjpkb1z3dr90vkanvs2l"; }; + patches = [ + # Fix mysql-workbench compilation + # https://bugs.mysql.com/bug.php?id=91923 + (fetchpatch { + name = "include-fix-segfault-in-getissuebanner-add-missing-wrappers-in-libsshpp.patch"; + url = https://git.libssh.org/projects/libssh.git/patch/?id=5ea81166bf885d0fd5d4bb232fc22633f5aaf3c4; + sha256 = "12q818l3nasqrfrsghxdvjcyya1bfcg0idvsf8xwm5zj7criln0a"; + }) + ]; + postPatch = '' # Fix headers to use libsodium instead of NaCl sed -i 's,nacl/,sodium/,g' ./include/libssh/curve25519.h src/curve25519.c diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index e584af775d2bb..14db7d6a1c4a8 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -4,7 +4,7 @@ , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages -, curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode +, curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, jansson , enableXen ? false, xen ? null , enableIscsi ? false, openiscsi }: @@ -35,11 +35,11 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl - libxslt xhtml1 perlPackages.XMLXPath curl libpcap + libxslt xhtml1 perlPackages.XMLXPath curl libpcap jansson ] ++ optionals (!buildFromTarball) [ libtool autoconf automake ] ++ optionals stdenv.isLinux [ - libpciaccess lvm2 lvm2 utillinux systemd libnl numad zfs + libpciaccess lvm2 utillinux systemd libnl numad zfs libapparmor libcap_ng numactl attr parted ] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [ xen @@ -59,6 +59,10 @@ in stdenv.mkDerivation rec { substituteInPlace src/lxc/lxc_conf.c \ --replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",' + [ -f ${jansson}/lib/libjansson.so.4 ] || exit 1 + substituteInPlace src/util/virjsoncompat.c \ + --replace '"libjansson.so.4"' '"${jansson}/lib/libjansson.so.4"' + patchShebangs . # fixes /usr/bin/python references ''; @@ -66,6 +70,7 @@ in stdenv.mkDerivation rec { "--localstatedir=/var" "--sysconfdir=/var/lib" "--with-libpcap" + "--with-qemu" "--with-vmware" "--with-vbox" "--with-test" diff --git a/pkgs/development/libraries/libytnef/default.nix b/pkgs/development/libraries/libytnef/default.nix index 8af7d5d8797c3..710e7a3f0729c 100644 --- a/pkgs/development/libraries/libytnef/default.nix +++ b/pkgs/development/libraries/libytnef/default.nix @@ -4,13 +4,13 @@ with lib; stdenv.mkDerivation rec { name = "libytnef-${version}"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "Yeraze"; repo = "ytnef"; rev = "v${version}"; - sha256 = "1aavckl7rjbiakwcf4rrkhchrl450p3vq3dy78cxfmgg0jqnvxqy"; + sha256 = "07h48s5qf08503pp9kafqbwipdqghiif22ghki7z8j67gyp04l6l"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/openbabel/default.nix b/pkgs/development/libraries/openbabel/default.nix index 61024a33113e0..bfbf6f1212fbb 100644 --- a/pkgs/development/libraries/openbabel/default.nix +++ b/pkgs/development/libraries/openbabel/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.all; maintainers = [ ]; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/openbsm/default.nix b/pkgs/development/libraries/openbsm/default.nix index 9f75bff40e9a5..a9559c6abfbac 100644 --- a/pkgs/development/libraries/openbsm/default.nix +++ b/pkgs/development/libraries/openbsm/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { homepage = http://www.openbsm.org/; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ matthewbauer ]; + license = lib.licenses.bsd2; }; } diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix index 8d0839041890a..cddc2038791ec 100644 --- a/pkgs/development/libraries/openscenegraph/default.nix +++ b/pkgs/development/libraries/openscenegraph/default.nix @@ -1,33 +1,72 @@ -{ stdenv, lib, fetchurl, cmake, pkgconfig, doxygen, unzip -, freetype, libjpeg, jasper, libxml2, zlib, gdal, curl, libX11 -, cairo, poppler, librsvg, libpng, libtiff, libXrandr -, xineLib, boost -, withApps ? false -, withSDL ? false, SDL -, withQt4 ? false, qt4 +{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, doxygen, + libX11, libXinerama, libXrandr, libGLU_combined, + glib, ilmbase, libxml2, pcre, zlib, + jpegSupport ? true, libjpeg, + jasperSupport ? true, jasper, + exrSupport ? false, openexr, + gifSupport ? true, giflib, + pngSupport ? true, libpng, + tiffSupport ? true, libtiff, + gdalSupport ? false, gdal, + curlSupport ? true, curl, + colladaSupport ? false, opencollada, + opencascadeSupport ? false, opencascade, + ffmpegSupport ? false, ffmpeg, + nvttSupport ? false, nvidia-texture-tools, + freetypeSupport ? true, freetype, + svgSupport ? false, librsvg, + pdfSupport ? false, poppler, + vncSupport ? false, libvncserver, + lasSupport ? false, libLAS, + luaSupport ? false, lua, + sdlSupport ? false, SDL2, + restSupport ? false, asio, boost, + withApps ? false, + withExamples ? false, fltk, wxGTK, }: stdenv.mkDerivation rec { name = "openscenegraph-${version}"; - version = "3.4.0"; + version = "3.6.2"; - src = fetchurl { - url = "http://trac.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-${version}.zip"; - sha256 = "03h4wfqqk7rf3mpz0sa99gy715cwpala7964z2npd8jxfn27swjw"; + src = fetchFromGitHub { + owner = "openscenegraph"; + repo = "OpenSceneGraph"; + rev = "fb40a0d1db018ff39a08699a7f17f7eb6d949c36"; + sha256 = "03jk6lclyd4biniaw04w7j0z1spkm69f1c19i37b8v9x3zv1p1id"; }; - nativeBuildInputs = [ pkgconfig cmake doxygen unzip ]; + nativeBuildInputs = [ pkgconfig cmake doxygen ]; buildInputs = [ - freetype libjpeg jasper libxml2 zlib gdal curl libX11 - cairo poppler librsvg libpng libtiff libXrandr boost - xineLib - ] ++ lib.optional withSDL SDL - ++ lib.optional withQt4 qt4; + libX11 libXinerama libXrandr libGLU_combined + glib ilmbase libxml2 pcre zlib + ] ++ lib.optional jpegSupport libjpeg + ++ lib.optional jasperSupport jasper + ++ lib.optional exrSupport openexr + ++ lib.optional gifSupport giflib + ++ lib.optional pngSupport libpng + ++ lib.optional tiffSupport libtiff + ++ lib.optional gdalSupport gdal + ++ lib.optional curlSupport curl + ++ lib.optional colladaSupport opencollada + ++ lib.optional opencascadeSupport opencascade + ++ lib.optional ffmpegSupport ffmpeg + ++ lib.optional nvttSupport nvidia-texture-tools + ++ lib.optional freetypeSupport freetype + ++ lib.optional svgSupport librsvg + ++ lib.optional pdfSupport poppler + ++ lib.optional vncSupport libvncserver + ++ lib.optional lasSupport libLAS + ++ lib.optional luaSupport lua + ++ lib.optional sdlSupport SDL2 + ++ lib.optionals restSupport [ asio boost ] + ++ lib.optionals withExamples [ fltk wxGTK ] + ; enableParallelBuilding = true; - cmakeFlags = lib.optional (!withApps) "-DBUILD_OSG_APPLICATIONS=OFF"; + cmakeFlags = lib.optional (!withApps) "-DBUILD_OSG_APPLICATIONS=OFF" ++ lib.optional withExamples "-DBUILD_OSG_EXAMPLES=ON"; meta = with stdenv.lib; { description = "A 3D graphics toolkit"; diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index e8bfb51cf9ee2..04104346748e3 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${version}.tar.bz2"; + url = "https://ftp.pcre.org/pub/pcre/pcre-${version}.tar.bz2"; sha256 = "00ckpzlgyr16bnqx8fawa3afjgqxw5yxgs2l081vw23qi1y4pl1c"; }; diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index a3c91f9f307ce..32841c9b93316 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -30,38 +30,31 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ which ]; - buildInputs = [ - xextproto - ] ++ stdenv.lib.optionals openglSupport [ - libGLU_combined libXmu - ] ++ stdenv.lib.optionals xftSupport [ - libXft libXft.freetype libXft.fontconfig - ] ++ stdenv.lib.optional xrenderSupport libXrender - ++ stdenv.lib.optional xineramaSupport libXinerama - ++ stdenv.lib.optional xrandrSupport libXrandr - ++ stdenv.lib.optional xineramaSupport libXinerama; - - propagatedBuildInputs = [ libpng xlibsWrapper libXft libXrender zlib libjpeg ]; + propagatedBuildInputs = [libpng xlibsWrapper libXft libXrender zlib libjpeg]; hardeningDisable = [ "format" ]; - configurePlatforms = []; - configureFlags = let - mk = cond: name: "-${stdenv.lib.optionalString cond "no-"}${name}"; - in [ - "-v" - "-system-zlib" "-system-libpng" "-system-libjpeg" - "-qt-gif" - (mk xftSupport "xft") - (mk xrenderSupport "xrender") - (mk xrandrSupport "xrandr") - (mk xineramaSupport "xinerama") - (mk threadSupport "thread") - ] ++ stdenv.lib.optionals mysqlSupport [ - "-qt-sql-mysql" - "-L${mysql.connector-c}/lib/mysql" - "-I${mysql.connector-c}/include/mysql" - ] ++ stdenv.lib.optional openglSupport "-dlopen-opengl"; + configureFlags = " + -v + -system-zlib -system-libpng -system-libjpeg + -qt-gif + -I${xextproto}/include + ${if openglSupport then "-dlopen-opengl + -L${libGLU_combined}/lib -I${libGLU_combined}/include + -L${libXmu.out}/lib -I${libXmu.dev}/include" else ""} + ${if threadSupport then "-thread" else "-no-thread"} + ${if xrenderSupport then "-xrender -L${libXrender.out}/lib -I${libXrender.dev}/include" else "-no-xrender"} + ${if xrandrSupport then "-xrandr + -L${libXrandr.out}/lib -I${libXrandr.dev}/include + -I${randrproto}/include" else "-no-xrandr"} + ${if xineramaSupport then "-xinerama -L${libXinerama.out}/lib -I${libXinerama.dev}/include" else "-no-xinerama"} + ${if cursorSupport then "-L${libXcursor.out}/lib -I${libXcursor.dev}/include" else ""} + ${if mysqlSupport then "-qt-sql-mysql -L${mysql.connector-c}/lib/mysql -I${mysql.connector-c}/include/mysql" else ""} + ${if xftSupport then "-xft + -L${libXft.out}/lib -I${libXft.dev}/include + -L${libXft.freetype.out}/lib -I${libXft.freetype.dev}/include + -L${libXft.fontconfig.lib}/lib -I${libXft.fontconfig.dev}/include" else "-no-xft"} + "; patches = [ # Don't strip everything so we can get useful backtraces. diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 463cb2938ede9..f7ddf8ff780cc 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -141,7 +141,7 @@ stdenv.mkDerivation rec { configurePlatforms = []; configureFlags = let - mk = cond: name: "-${lib.optionalString cond "no-"}${name}"; + mk = cond: name: "-${lib.optionalString (!cond) "no-"}${name}"; platformFlag = if stdenv.hostPlatform != stdenv.buildPlatform then "-xplatform" @@ -167,9 +167,9 @@ stdenv.mkDerivation rec { "-make" "libs" "-make" "tools" "-make" "translations" "-no-phonon" (mk buildWebkit "webkit") (mk buildMultimedia "multimedia") "-audio-backend" ]) ++ [ - (mk demos "make") "demos" - (mk examples "make") "examples" - (mk docs "make") "docs" + "-${if demos then "" else "no"}make" "demos" + "-${if examples then "" else "no"}make" "examples" + "-${if docs then "" else "no"}make" "docs" ] ++ lib.optional developerBuild "-developer-build" ++ lib.optionals stdenv.hostPlatform.isDarwin [ platformFlag "unsupported/macx-clang-libc++" ] ++ lib.optionals stdenv.hostPlatform.isWindows [ platformFlag "win32-g++-4.6" ]; diff --git a/pkgs/development/libraries/science/math/lcalc/default.nix b/pkgs/development/libraries/science/math/lcalc/default.nix index e55244b2a59f6..51fbd9f14cb49 100644 --- a/pkgs/development/libraries/science/math/lcalc/default.nix +++ b/pkgs/development/libraries/science/math/lcalc/default.nix @@ -69,7 +69,15 @@ stdenv.mkDerivation rec { url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/lcalc-c++11.patch?h=packages/lcalc&id=3607b97df5a8c231191115b0cb5c62426b339e71"; sha256 = "1ccrl61lv2vvx8ggldq54m5d0n1iy6mym7qz0i8nj6yj0dshnpk3"; }) - ]; + ] ++ stdenv.lib.optional stdenv.isDarwin + (fetchpatch { + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/lcalc/patches/clang.patch"; + sha256 = "0bb7656z6cp6i4p2qj745cmq0lhh52v2akl9whi760dynfdxbl18"; + }); + + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace src/Makefile --replace g++ c++ + ''; installFlags = [ "DESTDIR=$(out)" diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index aeab43c889d61..f4f10978ec13d 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -2,7 +2,7 @@ , openssl, libpulseaudio, pixman, gobjectIntrospection, libjpeg_turbo, zlib , cyrus_sasl, python2Packages, autoreconfHook, usbredir, libsoup , withPolkit ? true, polkit, acl, usbutils -, vala, gtk3, epoxy, libdrm, gst_all_1, phodav }: +, vala, gtk3, epoxy, libdrm, gst_all_1, phodav, opusfile }: # If this package is built with polkit support (withPolkit=true), # usb redirection reqires spice-client-glib-usb-acl-helper to run setuid root. @@ -30,13 +30,13 @@ with stdenv.lib; let inherit (python2Packages) python pygtk; in stdenv.mkDerivation rec { - name = "spice-gtk-0.34"; + name = "spice-gtk-0.35"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://www.spice-space.org/download/gtk/${name}.tar.bz2"; - sha256 = "1vknp72pl6v6nf3dphhwp29hk6gv787db2pmyg4m312z2q0hwwp9"; + sha256 = "11lymg467gvj5ys8k22ihnfbxjn4x34ygyzirpg2nphjwlyhgrml"; }; postPatch = '' @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { buildInputs = [ spice-protocol celt_0_5_1 openssl libpulseaudio gst_all_1.gst-plugins-base pixman - libjpeg_turbo zlib cyrus_sasl python pygtk usbredir gtk3 epoxy libdrm phodav + libjpeg_turbo zlib cyrus_sasl python pygtk usbredir gtk3 epoxy libdrm phodav opusfile ] ++ optionals withPolkit [ polkit acl usbutils ] ; nativeBuildInputs = [ pkgconfig gettext libsoup autoreconfHook vala gobjectIntrospection ]; @@ -58,6 +58,7 @@ in stdenv.mkDerivation rec { "--with-gtk3" "--enable-introspection" "--enable-vala" + "--enable-celt051" ]; dontDisableStatic = true; # Needed by the coroutine test diff --git a/pkgs/development/libraries/sqlite/analyzer.nix b/pkgs/development/libraries/sqlite/analyzer.nix index 031dd8f4f9c87..5b68b4901f9ac 100644 --- a/pkgs/development/libraries/sqlite/analyzer.nix +++ b/pkgs/development/libraries/sqlite/analyzer.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { description = "A tool that shows statistics about SQLite databases"; downloadPage = http://sqlite.org/download.html; homepage = http://www.sqlite.org; + license = licenses.publicDomain; maintainers = with maintainers; [ pesterhazy ]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 4fcaef7e0e230..166ea39493bf6 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -77,6 +77,7 @@ stdenv.mkDerivation rec { description = "A self-contained, serverless, zero-configuration, transactional SQL database engine"; downloadPage = http://sqlite.org/download.html; homepage = http://www.sqlite.org/; + license = licenses.publicDomain; maintainers = with maintainers; [ eelco np ]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/sqlite/sqlar.nix b/pkgs/development/libraries/sqlite/sqlar.nix index 734d68ca3d492..e5d322330e8e9 100644 --- a/pkgs/development/libraries/sqlite/sqlar.nix +++ b/pkgs/development/libraries/sqlite/sqlar.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://sqlite.org/sqlar; description = "SQLite Archive utilities"; + license = licenses.bsd2; platforms = platforms.all; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix index 7bf3149974339..fc9abdc24c7c4 100644 --- a/pkgs/development/libraries/sundials/default.nix +++ b/pkgs/development/libraries/sundials/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "sundials"; - version = "3.1.1"; + version = "3.1.2"; name = "${pname}-${version}"; src = fetchurl { url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz"; - sha256 = "090s8ymhd0g1s1d44fa73r5yi32hb4biwahhbfi327zd64yn8kd2"; + sha256 = "05p19y3vv0vi3nggrvy6ymqkvhab2dxncl044qj0xnaix2qmp658"; }; preConfigure = '' diff --git a/pkgs/development/libraries/tre/default.nix b/pkgs/development/libraries/tre/default.nix index 12f7e4c765d22..901b6aa097fdb 100644 --- a/pkgs/development/libraries/tre/default.nix +++ b/pkgs/development/libraries/tre/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.bsd2; }; } diff --git a/pkgs/development/misc/stm32/betaflight/default.nix b/pkgs/development/misc/stm32/betaflight/default.nix index 8d4d0d7f4a2b2..0c601c7773cc5 100644 --- a/pkgs/development/misc/stm32/betaflight/default.nix +++ b/pkgs/development/misc/stm32/betaflight/default.nix @@ -1,18 +1,17 @@ { stdenv, fetchFromGitHub , gcc-arm-embedded, python2 , skipTargets ? [ - # These targets do not build for various unexplored reasons - # TODO ... fix them - "AFROMINI" - "ALIENWHOOP" - "BEEBRAIN" - "CJMCU" - "FRSKYF3" + # These targets do not build, for the reasons listed, along with the last version checked. + # Probably all of the issues with these targets need to be addressed upstream. + "AG3X" # 3.4.0-rc4: has not specified a valid STM group, must be one of F1, F3, F405, F411 or F7x5. Have you prepared a valid target.mk? + "ALIENWHOOP" # 3.4.0-rc4: has not specified a valid STM group, must be one of F1, F3, F405, F411 or F7x5. Have you prepared a valid target.mk? + "FURYF3" # 3.4.0-rc4: flash region overflow + "OMNINXT" # 3.4.0-rc4: has not specified a valid STM group, must be one of F1, F3, F405, F411 or F7x5. Have you prepared a valid target.mk? ]}: let - version = "3.2.3"; + version = "3.4.0-rc4"; in stdenv.mkDerivation rec { @@ -21,8 +20,8 @@ in stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "betaflight"; repo = "betaflight"; - rev = "v${version}"; - sha256 = "0vbjyxfjxgpaiiwvj5bscrlfikzp3wnxpmc4sxcz5yw5mwb9g428"; + rev = "8e9e7574481b1abba9354b24f41eb31054943785"; # Always use a commit id here! + sha256 = "1wyp23p876xbfi9z6gm4xn1nwss3myvrjjjq9pd3s0vf5gkclkg5"; }; buildInputs = [ @@ -31,7 +30,7 @@ in stdenv.mkDerivation rec { ]; postPatch = '' - sed -ri "s/REVISION.*=.*git log.*/REVISION = ${builtins.substring 0 9 src.rev}/" Makefile # Let's not require git in shell + sed -ri "s/REVISION.*=.*git log.*/REVISION = ${builtins.substring 0 10 src.rev}/" Makefile # Simulate abbrev'd rev. sed -ri "s/binary hex/hex/" Makefile # No need for anything besides .hex ''; @@ -39,7 +38,7 @@ in stdenv.mkDerivation rec { preBuild = '' buildFlagsArray=( - "SKIP_TARGETS=${toString skipTargets}" + "NOBUILD_TARGETS=${toString skipTargets}" "GCC_REQUIRED_VERSION=$(arm-none-eabi-gcc -dumpversion)" all ) @@ -59,7 +58,7 @@ in stdenv.mkDerivation rec { homepage = https://github.com/betaflight/betaflight; license = licenses.gpl3; maintainers = with maintainers; [ elitak ]; - platforms = platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/development/misc/stm32/inav/default.nix b/pkgs/development/misc/stm32/inav/default.nix new file mode 100644 index 0000000000000..cb9cc80d32525 --- /dev/null +++ b/pkgs/development/misc/stm32/inav/default.nix @@ -0,0 +1,56 @@ +{ stdenv, fetchFromGitHub +, gcc-arm-embedded, ruby +}: + +let + + version = "2.0.0-rc2"; + +in stdenv.mkDerivation rec { + + name = "inav-${version}"; + + src = fetchFromGitHub { + owner = "iNavFlight"; + repo = "inav"; + rev = "a8415e89c2956d133d8175827c079bcf3bc3766c"; # Always use a commit id here! + sha256 = "15zai8qf43b06fmws1sbkmdgip51zp7gkfj7pp9b6gi8giarzq3y"; + }; + + buildInputs = [ + gcc-arm-embedded + ruby + ]; + + postPatch = '' + sed -ri "s/REVISION.*=.*shell git.*/REVISION = ${builtins.substring 0 10 src.rev}/" Makefile # Simulate abbrev'd rev. + sed -ri "s/-j *[0-9]+//" Makefile # Eliminate parallel build args in submakes + sed -ri "s/binary hex/hex/" Makefile # No need for anything besides .hex + ''; + + enableParallelBuilding = true; + + preBuild = '' + buildFlagsArray=( + all + ) + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp obj/*.hex $out + + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Navigation-enabled flight control software"; + homepage = https://inavflight.github.io; + license = licenses.gpl3; + maintainers = with maintainers; [ elitak ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; + +} diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix index fd8651e89cf5b..972c8a5dfbceb 100644 --- a/pkgs/development/mobile/androidenv/androidndk.nix +++ b/pkgs/development/mobile/androidenv/androidndk.nix @@ -91,5 +91,6 @@ stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; + license = stdenv.lib.licenses.asl20; }; } diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index 8d9f87b6d0799..503e4f5c889b4 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -267,5 +267,6 @@ stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.unix; hydraPlatforms = []; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json index dd8d0818703c4..7cb77cf476cb1 100644 --- a/pkgs/development/node-packages/node-packages-v6.json +++ b/pkgs/development/node-packages/node-packages-v6.json @@ -105,6 +105,7 @@ , "svgo" , "tern" , "titanium" +, "triton" , "typescript" , "typings" , "uglify-js" diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index 6dae8dd701314..a50be209bcdfd 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -3154,6 +3154,15 @@ let sha1 = "31ab1ac8b129363463e35b3ebb69f4dfcfba7947"; }; }; + "backoff-2.4.1" = { + name = "backoff"; + packageName = "backoff"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/backoff/-/backoff-2.4.1.tgz"; + sha1 = "2f68c50e0dd789dbefe24200a62efb04d2456d68"; + }; + }; "backoff-2.5.0" = { name = "backoff"; packageName = "backoff"; @@ -3469,6 +3478,15 @@ let sha512 = "+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q=="; }; }; + "bigspinner-3.1.0" = { + name = "bigspinner"; + packageName = "bigspinner"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bigspinner/-/bigspinner-3.1.0.tgz"; + sha1 = "dd3a862b2fedf66fee8471320069428d0d84427a"; + }; + }; "bin-version-2.0.0" = { name = "bin-version"; packageName = "bin-version"; @@ -5629,6 +5647,15 @@ let sha1 = "8d21967625b25ee35fca8e8453ccf10fccd04e45"; }; }; + "cmdln-4.1.2" = { + name = "cmdln"; + packageName = "cmdln"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cmdln/-/cmdln-4.1.2.tgz"; + sha1 = "4345bb5498f2b096ba85ec8c5579a8cb252f7c70"; + }; + }; "co-3.1.0" = { name = "co"; packageName = "co"; @@ -10356,6 +10383,15 @@ let sha1 = "4d58b815ace5bebfc4ebf03cf98b0a7604a99b86"; }; }; + "extsprintf-1.0.2" = { + name = "extsprintf"; + packageName = "extsprintf"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"; + sha1 = "e1080e0658e300b06294990cc70e1502235fd550"; + }; + }; "extsprintf-1.2.0" = { name = "extsprintf"; packageName = "extsprintf"; @@ -11616,6 +11652,15 @@ let sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; }; }; + "fuzzyset.js-0.0.1" = { + name = "fuzzyset.js"; + packageName = "fuzzyset.js"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fuzzyset.js/-/fuzzyset.js-0.0.1.tgz"; + sha1 = "979e22f9451b4b38f051f7937c919dbacc692958"; + }; + }; "fx-runner-1.0.9" = { name = "fx-runner"; packageName = "fx-runner"; @@ -11841,6 +11886,15 @@ let sha512 = "bOZafIX+19cCS5KUjHtlJPZW+4joMa5tISIk5CugjmlZE0zZtjwB59wm56JPXVy5ELivw7g4Z9TEI0EDa2CSwQ=="; }; }; + "getpass-0.1.6" = { + name = "getpass"; + packageName = "getpass"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz"; + sha1 = "283ffd9fc1256840875311c1b60e8c40187110e6"; + }; + }; "getpass-0.1.7" = { name = "getpass"; packageName = "getpass"; @@ -15676,6 +15730,15 @@ let sha1 = "cd13466ea2480dbd8396a570d47d31dda476f8b1"; }; }; + "jsprim-1.4.0" = { + name = "jsprim"; + packageName = "jsprim"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz"; + sha1 = "a3b87e40298d8c380552d8cc7628a0bb95a22918"; + }; + }; "jsprim-1.4.1" = { name = "jsprim"; packageName = "jsprim"; @@ -17216,6 +17279,15 @@ let sha1 = "6952722ffa3049a55a5e1c10ee4a0947a3e5e19b"; }; }; + "lomstream-1.1.0" = { + name = "lomstream"; + packageName = "lomstream"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lomstream/-/lomstream-1.1.0.tgz"; + sha1 = "2a7f8066ec3ab40bef28ca384842e75340183bf0"; + }; + }; "long-2.4.0" = { name = "long"; packageName = "long"; @@ -17432,6 +17504,15 @@ let sha1 = "2738bd9f0d3cf4f84490c5736c48699ac632cda3"; }; }; + "lstream-0.0.4" = { + name = "lstream"; + packageName = "lstream"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lstream/-/lstream-0.0.4.tgz"; + sha1 = "d637764ea33a929bd00f34d2a23c2256d0d5fb5b"; + }; + }; "ltgt-1.0.2" = { name = "ltgt"; packageName = "ltgt"; @@ -18575,6 +18656,15 @@ let sha1 = "3bac3f3924a845d147784fc6558dee900b0151e2"; }; }; + "mooremachine-2.2.1" = { + name = "mooremachine"; + packageName = "mooremachine"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mooremachine/-/mooremachine-2.2.1.tgz"; + sha1 = "0d9891aa7c2cf32ca73e72f52a3561ed787e2e8c"; + }; + }; "morgan-1.6.1" = { name = "morgan"; packageName = "morgan"; @@ -20552,6 +20642,15 @@ let sha1 = "151af86bfc1f08c4b9f07d06ab250ffcbeb56581"; }; }; + "once-1.3.2" = { + name = "once"; + packageName = "once"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/once/-/once-1.3.2.tgz"; + sha1 = "d8feeca93b039ec1dcdee7741c92bdac5e28081b"; + }; + }; "once-1.3.3" = { name = "once"; packageName = "once"; @@ -24324,6 +24423,33 @@ let sha1 = "e1e5b7ad9d4f6aeacd20e28f44a045f26c146dbc"; }; }; + "restify-clients-1.5.2" = { + name = "restify-clients"; + packageName = "restify-clients"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/restify-clients/-/restify-clients-1.5.2.tgz"; + sha1 = "d4b13d82f287e77e2eb5daae14e6ef8534aa7389"; + }; + }; + "restify-errors-3.0.0" = { + name = "restify-errors"; + packageName = "restify-errors"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/restify-errors/-/restify-errors-3.0.0.tgz"; + sha1 = "3b17177d43954acece4291465a97ce1b58cf3d57"; + }; + }; + "restify-errors-3.1.0" = { + name = "restify-errors"; + packageName = "restify-errors"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/restify-errors/-/restify-errors-3.1.0.tgz"; + sha1 = "06b5479477874c0856d782a12c8707dcdad53f16"; + }; + }; "restore-cursor-1.0.1" = { name = "restore-cursor"; packageName = "restore-cursor"; @@ -24432,6 +24558,15 @@ let sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; }; }; + "rimraf-2.4.4" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz"; + sha1 = "b528ce2ebe0e6d89fb03b265de11d61da0dbcf82"; + }; + }; "rimraf-2.4.5" = { name = "rimraf"; packageName = "rimraf"; @@ -24864,6 +24999,15 @@ let sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a"; }; }; + "semver-5.1.0" = { + name = "semver"; + packageName = "semver"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz"; + sha1 = "85f2cf8550465c4df000cf7d86f6b054106ab9e5"; + }; + }; "semver-5.1.1" = { name = "semver"; packageName = "semver"; @@ -25692,6 +25836,15 @@ let sha1 = "96568a565e9d9feb03b93a50651eee14d23adf44"; }; }; + "smartdc-auth-2.5.7" = { + name = "smartdc-auth"; + packageName = "smartdc-auth"; + version = "2.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/smartdc-auth/-/smartdc-auth-2.5.7.tgz"; + sha1 = "42d45710e791deb92df91326c8eed1bd5a842cb6"; + }; + }; "smtp-connection-1.3.8" = { name = "smtp-connection"; packageName = "smtp-connection"; @@ -26601,6 +26754,15 @@ let sha1 = "512675a28f08f1e581779e1989ab1e13effb49e4"; }; }; + "sshpk-1.14.1" = { + name = "sshpk"; + packageName = "sshpk"; + version = "1.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz"; + sha1 = "130f5975eddad963f1d56f92b9ac6c51fa9f83eb"; + }; + }; "sshpk-1.14.2" = { name = "sshpk"; packageName = "sshpk"; @@ -26628,6 +26790,15 @@ let sha1 = "62e143c18530fda103320b3403e8ad42786d9718"; }; }; + "sshpk-agent-1.7.0" = { + name = "sshpk-agent"; + packageName = "sshpk-agent"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sshpk-agent/-/sshpk-agent-1.7.0.tgz"; + sha512 = "zR4GV5XYSypCusFzfTeTSXVqrFJJsK79Ec2KXZdo/x7qxBGSJPPZFtqMcqpXPaJ9VCK7Zn/vI+/kMrqeQILv4w=="; + }; + }; "ssri-5.3.0" = { name = "ssri"; packageName = "ssri"; @@ -27330,6 +27501,15 @@ let sha1 = "f7fb93758a69a571140181277eea0c2eb1301fa3"; }; }; + "strsplit-1.0.0" = { + name = "strsplit"; + packageName = "strsplit"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strsplit/-/strsplit-1.0.0.tgz"; + sha1 = "0fdedc68e91addcfcb2e6be9c262581a6e8c28aa"; + }; + }; "subarg-1.0.0" = { name = "subarg"; packageName = "subarg"; @@ -27538,6 +27718,15 @@ let sha256 = "c824206b33da96cf5c01c21f1b133a0e3568e07ee4dcc9beefa8226864cd0272"; }; }; + "tabula-1.10.0" = { + name = "tabula"; + packageName = "tabula"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tabula/-/tabula-1.10.0.tgz"; + sha1 = "2ed67caf8cad091de80e43622850d899713b2f47"; + }; + }; "taffydb-2.6.2" = { name = "taffydb"; packageName = "taffydb"; @@ -29851,6 +30040,15 @@ let sha1 = "8a6a4ac3a8c774b6f687fece49bdffd78552e2cd"; }; }; + "verror-1.3.6" = { + name = "verror"; + packageName = "verror"; + version = "1.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz"; + sha1 = "cff5df12946d297d2baaefaa2689e25be01c005c"; + }; + }; "verror-1.6.0" = { name = "verror"; packageName = "verror"; @@ -30103,6 +30301,15 @@ let sha1 = "3b899a8ef71c37f3054d79bdbdda31c7bf36f20d"; }; }; + "vstream-0.1.0" = { + name = "vstream"; + packageName = "vstream"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vstream/-/vstream-0.1.0.tgz"; + sha1 = "13587190f34e72ba7a07ebbaa7e70ac147b1fb7d"; + }; + }; "walk-2.3.14" = { name = "walk"; packageName = "walk"; @@ -46946,6 +47153,189 @@ in production = true; bypassCache = false; }; + triton = nodeEnv.buildNodePackage { + name = "triton"; + packageName = "triton"; + version = "6.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/triton/-/triton-6.1.2.tgz"; + sha1 = "1f4376383ea07de8bffbfd00b445719d57a5f474"; + }; + dependencies = [ + sources."asn1-0.2.4" + sources."assert-plus-0.2.0" + sources."backoff-2.4.1" + sources."balanced-match-1.0.0" + sources."bcrypt-pbkdf-1.0.2" + sources."bigspinner-3.1.0" + sources."brace-expansion-1.1.11" + sources."bunyan-1.8.12" + sources."clone-0.1.5" + (sources."cmdln-4.1.2" // { + dependencies = [ + sources."assert-plus-1.0.0" + sources."extsprintf-1.4.0" + ]; + }) + sources."concat-map-0.0.1" + sources."core-util-is-1.0.2" + (sources."dashdash-1.14.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."dtrace-provider-0.8.7" + sources."ecc-jsbn-0.1.2" + sources."extsprintf-1.0.2" + sources."fast-safe-stringify-1.2.3" + sources."fuzzyset.js-0.0.1" + (sources."getpass-0.1.6" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."glob-5.0.15" + (sources."http-signature-1.2.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."is-absolute-0.1.7" + sources."is-relative-0.1.3" + sources."isarray-1.0.0" + sources."isexe-1.1.2" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + sources."verror-1.3.6" + ]; + }) + sources."keep-alive-agent-0.0.1" + sources."lodash-4.17.10" + (sources."lomstream-1.1.0" // { + dependencies = [ + sources."assert-plus-0.1.5" + sources."extsprintf-1.3.0" + ]; + }) + sources."lru-cache-4.1.3" + sources."lstream-0.0.4" + sources."mime-1.6.0" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."moment-2.22.2" + sources."mooremachine-2.2.1" + sources."mute-stream-0.0.7" + sources."mv-2.1.1" + sources."nan-2.10.0" + sources."ncp-2.0.0" + sources."once-1.3.2" + sources."path-is-absolute-1.0.1" + sources."precond-0.2.3" + sources."process-nextick-args-2.0.0" + sources."pseudomap-1.0.2" + sources."read-1.0.7" + sources."readable-stream-2.3.6" + (sources."restify-clients-1.5.2" // { + dependencies = [ + sources."assert-plus-1.0.0" + (sources."restify-errors-3.1.0" // { + dependencies = [ + sources."assert-plus-0.2.0" + sources."lodash-3.10.1" + ]; + }) + ]; + }) + (sources."restify-errors-3.0.0" // { + dependencies = [ + sources."assert-plus-0.1.5" + sources."lodash-3.10.1" + ]; + }) + sources."rimraf-2.4.4" + sources."safe-buffer-5.1.2" + sources."safe-json-stringify-1.2.0" + sources."safer-buffer-2.1.2" + sources."semver-5.1.0" + (sources."smartdc-auth-2.5.7" // { + dependencies = [ + sources."assert-plus-1.0.0" + (sources."dashdash-1.10.1" // { + dependencies = [ + sources."assert-plus-0.1.5" + ]; + }) + sources."extsprintf-1.0.0" + sources."json-schema-0.2.2" + (sources."jsprim-0.3.0" // { + dependencies = [ + sources."verror-1.3.3" + ]; + }) + sources."once-1.3.0" + sources."vasync-1.4.3" + sources."verror-1.1.0" + ]; + }) + (sources."sshpk-1.14.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-agent-1.7.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."string_decoder-1.1.1" + sources."strsplit-1.0.0" + (sources."tabula-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."util-deprecate-1.0.2" + sources."uuid-3.3.2" + (sources."vasync-1.6.3" // { + dependencies = [ + sources."extsprintf-1.2.0" + sources."verror-1.6.0" + ]; + }) + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + sources."extsprintf-1.4.0" + ]; + }) + (sources."vstream-0.1.0" // { + dependencies = [ + sources."assert-plus-0.1.5" + sources."extsprintf-1.2.0" + ]; + }) + sources."which-1.2.4" + sources."wordwrap-1.0.0" + sources."wrappy-1.0.2" + sources."yallist-2.1.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Joyent Triton CLI and client (https://www.joyent.com/triton)"; + homepage = https://github.com/joyent/node-triton; + license = "MPL-2.0"; + }; + production = true; + bypassCache = false; + }; typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; diff --git a/pkgs/development/ocaml-modules/wasm/default.nix b/pkgs/development/ocaml-modules/wasm/default.nix index 5fe0e2abc1952..e10a67a50a0d5 100644 --- a/pkgs/development/ocaml-modules/wasm/default.nix +++ b/pkgs/development/ocaml-modules/wasm/default.nix @@ -21,11 +21,16 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; + postInstall = '' + mkdir $out/bin + cp -L interpreter/wasm $out/bin + ''; + meta = { - description = "An OCaml library to read and write Web Assembly (wasm) files and manipulate their AST"; + description = "An executable and OCaml library to run, read and write Web Assembly (wasm) files and manipulate their AST"; license = stdenv.lib.licenses.asl20; maintainers = [ stdenv.lib.maintainers.vbgl ]; - inherit (src.meta) homepage; + homepage = https://github.com/WebAssembly/spec/tree/master/interpreter; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/python-modules/acme/default.nix b/pkgs/development/python-modules/acme/default.nix index 820ee2a95d81a..503c6f796591a 100644 --- a/pkgs/development/python-modules/acme/default.nix +++ b/pkgs/development/python-modules/acme/default.nix @@ -27,4 +27,8 @@ buildPythonPackage rec { checkInputs = [ nose ]; postUnpack = "sourceRoot=\${sourceRoot}/acme"; + + meta = certbot.meta // { + description = "ACME protocol implementation in Python"; + }; } diff --git a/pkgs/development/python-modules/amqplib/default.nix b/pkgs/development/python-modules/amqplib/default.nix index 37f1e395d8dee..3699fdd5d4993 100644 --- a/pkgs/development/python-modules/amqplib/default.nix +++ b/pkgs/development/python-modules/amqplib/default.nix @@ -15,5 +15,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { homepage = http://code.google.com/p/py-amqplib/; description = "Python client for the Advanced Message Queuing Procotol (AMQP)"; + license = licenses.lgpl21; }; } diff --git a/pkgs/development/python-modules/ansi/default.nix b/pkgs/development/python-modules/ansi/default.nix index a79de55d2eb01..77b93ce890e48 100644 --- a/pkgs/development/python-modules/ansi/default.nix +++ b/pkgs/development/python-modules/ansi/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "ansi"; @@ -12,4 +12,10 @@ buildPythonPackage rec { checkPhase = '' python -c "import ansi.color" ''; + + meta = with lib; { + description = "ANSI cursor movement and graphics"; + homepage = https://github.com/tehmaze/ansi/; + license = licenses.mit; + }; } diff --git a/pkgs/development/python-modules/anyjson/default.nix b/pkgs/development/python-modules/anyjson/default.nix index 6db4bbdc31486..65476b47f8fd3 100644 --- a/pkgs/development/python-modules/anyjson/default.nix +++ b/pkgs/development/python-modules/anyjson/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, isPy3k, nose }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, nose }: buildPythonPackage rec { pname = "anyjson"; @@ -14,8 +14,9 @@ buildPythonPackage rec { buildInputs = [ nose ]; - meta = { - homepage = https://pypi.python.org/pypi/anyjson/; + meta = with lib; { + homepage = https://bitbucket.org/runeh/anyjson/; description = "Wrapper that selects the best available JSON implementation"; + license = licenses.bsd2; }; } diff --git a/pkgs/development/python-modules/application/default.nix b/pkgs/development/python-modules/application/default.nix index 584eb3ae2c521..520e01723e6cb 100644 --- a/pkgs/development/python-modules/application/default.nix +++ b/pkgs/development/python-modules/application/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchdarcs, zope_interface, isPy3k }: +{ lib, buildPythonPackage, fetchdarcs, zope_interface, isPy3k }: buildPythonPackage rec { pname = "python-application"; @@ -12,4 +12,10 @@ buildPythonPackage rec { }; buildInputs = [ zope_interface ]; + + meta = with lib; { + description = "Basic building blocks for python applications"; + homepage = https://github.com/AGProjects/python-application; + license = licenses.lgpl2Plus; + }; } diff --git a/pkgs/development/python-modules/area53/default.nix b/pkgs/development/python-modules/area53/default.nix index 20013b8a1ed44..cd8e83dbf630f 100644 --- a/pkgs/development/python-modules/area53/default.nix +++ b/pkgs/development/python-modules/area53/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , boto }: buildPythonPackage rec { @@ -14,4 +14,10 @@ buildPythonPackage rec { doCheck = false; propagatedBuildInputs = [ boto ]; + + meta = with lib; { + description = "Python Interface to Route53"; + homepage = https://github.com/mariusv/Area53; + license = licenses.unfree; # unspecified + }; } diff --git a/pkgs/development/python-modules/bitbucket-cli/default.nix b/pkgs/development/python-modules/bitbucket-cli/default.nix index b5d115f4d0bb8..0a54c0ed17c38 100644 --- a/pkgs/development/python-modules/bitbucket-cli/default.nix +++ b/pkgs/development/python-modules/bitbucket-cli/default.nix @@ -19,5 +19,6 @@ buildPythonPackage rec { description = "Bitbucket command line interface"; homepage = https://bitbucket.org/zhemao/bitbucket-cli; maintainers = with maintainers; [ refnil ]; + license = licenses.bsd2; }; } diff --git a/pkgs/development/python-modules/browser-cookie3/default.nix b/pkgs/development/python-modules/browser-cookie3/default.nix new file mode 100644 index 0000000000000..64510ee5b6409 --- /dev/null +++ b/pkgs/development/python-modules/browser-cookie3/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchPypi, buildPythonPackage, isPy3k, keyring, pbkdf2, pyaes}: +buildPythonPackage rec { + pname = "browser-cookie3"; + version = "0.6.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "16nghwsrv08gz4iiyxsy5lgg5ljgrwkp471m7xnsvhhpb3axmnsc"; + }; + + disabled = !isPy3k; + + propagatedBuildInputs = [ keyring pbkdf2 pyaes ]; + + # No tests implemented + doCheck = false; + + meta = with lib; { + description = "Loads cookies from your browser into a cookiejar object"; + maintainers = with maintainers; [ borisbabic ]; + homepage = https://github.com/borisbabic/browser_cookie3; + license = licenses.gpl3; + }; +} diff --git a/pkgs/development/python-modules/pyls-black/default.nix b/pkgs/development/python-modules/pyls-black/default.nix new file mode 100644 index 0000000000000..b19fad1a1f199 --- /dev/null +++ b/pkgs/development/python-modules/pyls-black/default.nix @@ -0,0 +1,32 @@ +{ lib, buildPythonPackage, fetchFromGitHub +, black, toml, pytest, python-language-server, isPy3k +}: + +buildPythonPackage rec { + pname = "pyls-black"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "rupert"; + repo = "pyls-black"; + rev = "v${version}"; + sha256 = "0xa3iv8nhnj0lw0dh41qb0dqp55sb6rdxalbk60v8jll6qyc0si8"; + }; + + disabled = !isPy3k; + + checkPhase = '' + pytest + ''; + + checkInputs = [ pytest ]; + + propagatedBuildInputs = [ black toml python-language-server ]; + + meta = with lib; { + homepage = https://github.com/rupert/pyls-black; + description = "Black plugin for the Python Language Server"; + license = licenses.mit; + maintainers = [ maintainers.mic92 ]; + }; +} diff --git a/pkgs/development/python-modules/pyls-isort/default.nix b/pkgs/development/python-modules/pyls-isort/default.nix index fce7999a75698..fa94441e20034 100644 --- a/pkgs/development/python-modules/pyls-isort/default.nix +++ b/pkgs/development/python-modules/pyls-isort/default.nix @@ -21,8 +21,8 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = https://github.com/palantir/python-language-server; - description = "An implementation of the Language Server Protocol for Python"; + homepage = https://github.com/paradoxxxzero/pyls-isort; + description = "Isort plugin for python-language-server"; license = licenses.mit; maintainers = [ maintainers.mic92 ]; }; diff --git a/pkgs/development/python-modules/pyls-mypy/default.nix b/pkgs/development/python-modules/pyls-mypy/default.nix index 985d1937d3fbc..dfba421ae58d2 100644 --- a/pkgs/development/python-modules/pyls-mypy/default.nix +++ b/pkgs/development/python-modules/pyls-mypy/default.nix @@ -1,29 +1,21 @@ -{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch +{ lib, buildPythonPackage, fetchFromGitHub , future, python-language-server, mypy, configparser , pytest, mock, isPy3k, pytestcov, coverage }: buildPythonPackage rec { pname = "pyls-mypy"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "tomv564"; repo = "pyls-mypy"; rev = version; - sha256 = "0wa038a8a8yj3wmrc7q909nj4b5d3lq70ysbw7rpsnyb0x06m826"; + sha256 = "0v7ghcd1715lxlfq304b7xhchp31ahdd89lf6za4n0l59dz74swh"; }; disabled = !isPy3k; - patches = [ - # also part of https://github.com/tomv564/pyls-mypy/pull/10 - (fetchpatch { - url = "https://github.com/Mic92/pyls-mypy/commit/4c727120d2cbd8bf2825e1491cd55175f03266d2.patch"; - sha256 = "1dgn5z742swpxwknmgvm65jpxq9zwzhggw4nl6ys7yw8r49kqgrl"; - }) - ]; - checkPhase = '' HOME=$TEMPDIR pytest ''; @@ -35,8 +27,8 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = https://github.com/palantir/python-language-server; - description = "An implementation of the Language Server Protocol for Python"; + homepage = https://github.com/tomv564/pyls-mypy; + description = "Mypy plugin for the Python Language Server"; license = licenses.mit; maintainers = [ maintainers.mic92 ]; }; diff --git a/pkgs/development/python-modules/thespian/default.nix b/pkgs/development/python-modules/thespian/default.nix index 0ced52c7ba105..c964a4ed2f10e 100644 --- a/pkgs/development/python-modules/thespian/default.nix +++ b/pkgs/development/python-modules/thespian/default.nix @@ -1,13 +1,13 @@ { fetchPypi, buildPythonPackage, lib }: buildPythonPackage rec { - version = "3.9.2"; + version = "3.9.4"; pname = "thespian"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "aec9793fecf45bb91fe919dc61b5c48a4aadfb9f94b06cd92883df7952eacf95"; + sha256 = "98766eb304ef922133baca12a75eedd8d9b709c58bd9af50bfa5593dc3ffe0e1"; }; # Do not run the test suite: it takes a long time and uses diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix index f283479c8de8d..b14e0226d732f 100644 --- a/pkgs/development/python-modules/zeep/default.nix +++ b/pkgs/development/python-modules/zeep/default.nix @@ -20,6 +20,7 @@ , pytestcov , requests-mock , tornado +, attrs }: buildPythonPackage rec { @@ -32,6 +33,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ + attrs appdirs cached-property defusedxml diff --git a/pkgs/development/tools/analysis/emma/default.nix b/pkgs/development/tools/analysis/emma/default.nix index c4e37e5c700a1..1bd24b4785d03 100644 --- a/pkgs/development/tools/analysis/emma/default.nix +++ b/pkgs/development/tools/analysis/emma/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation { homepage = http://emma.sourceforge.net/; description = "A code coverage tool for Java"; platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.cpl10; }; } diff --git a/pkgs/development/tools/analysis/findbugs/default.nix b/pkgs/development/tools/analysis/findbugs/default.nix index a5a3d2439186f..7f2df62008f00 100644 --- a/pkgs/development/tools/analysis/findbugs/default.nix +++ b/pkgs/development/tools/analysis/findbugs/default.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation rec { homepage = http://findbugs.sourceforge.net/; maintainers = with maintainers; [ pSub ]; platforms = with platforms; unix; + license = licenses.lgpl3; }; } diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 56b64cd061b57..2c81e27d3a20b 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -5,7 +5,7 @@ # Also, don't clean up environment variables. , enableNixHacks ? false # Apple dependencies -, libcxx, CoreFoundation, CoreServices, Foundation +, cctools, clang, libcxx, CoreFoundation, CoreServices, Foundation }: let @@ -75,7 +75,34 @@ stdenv.mkDerivation rec { ''; postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + # Disable Bazel's Xcode toolchain detection which would configure compilers + # and linkers from Xcode instead of from PATH + export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 + + # Framework search paths aren't added by bintools hook + # https://github.com/NixOS/nixpkgs/pull/41914 export NIX_LDFLAGS="$NIX_LDFLAGS -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks" + + # libcxx includes aren't added by libcxx hook + # https://github.com/NixOS/nixpkgs/pull/41589 + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${libcxx}/include/c++/v1" + + # don't use system installed Xcode to run clang, use Nix clang instead + sed -i -e "s;/usr/bin/xcrun clang;${clang}/bin/clang $NIX_CFLAGS_COMPILE $NIX_LDFLAGS -framework CoreFoundation;g" \ + scripts/bootstrap/compile.sh \ + src/tools/xcode/realpath/BUILD \ + src/tools/xcode/stdredirect/BUILD \ + tools/osx/BUILD + + # clang installed from Xcode has a compatibility wrapper that forwards + # invocations of gcc to clang, but vanilla clang doesn't + sed -i -e 's;_find_generic(repository_ctx, "gcc", "CC", overriden_tools);_find_generic(repository_ctx, "clang", "CC", overriden_tools);g' tools/cpp/unix_cc_configure.bzl + + sed -i -e 's;/usr/bin/libtool;${cctools}/bin/libtool;g' tools/cpp/unix_cc_configure.bzl + wrappers=( tools/cpp/osx_cc_wrapper.sh tools/cpp/osx_cc_wrapper.sh.tpl ) + for wrapper in "''${wrappers[@]}"; do + sed -i -e "s,/usr/bin/install_name_tool,${cctools}/bin/install_name_tool,g" $wrapper + done '' + '' find src/main/java/com/google/devtools -type f -print0 | while IFS="" read -r -d "" path; do substituteInPlace "$path" \ @@ -119,7 +146,7 @@ stdenv.mkDerivation rec { makeWrapper which customBash - ] ++ lib.optionals (stdenv.isDarwin) [ libcxx CoreFoundation CoreServices Foundation ]; + ] ++ lib.optionals (stdenv.isDarwin) [ cctools clang libcxx CoreFoundation CoreServices Foundation ]; # If TMPDIR is in the unpack dir we run afoul of blaze's infinite symlink # detector (see com.google.devtools.build.lib.skyframe.FileFunction). diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix index c61bf3287db18..a57d20e2702a3 100644 --- a/pkgs/development/tools/build-managers/cmake/2.8.nix +++ b/pkgs/development/tools/build-managers/cmake/2.8.nix @@ -84,5 +84,6 @@ stdenv.mkDerivation rec { description = "Cross-Platform Makefile Generator"; platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ ]; + license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index ed0928febe296..81a1dd23f2e04 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -126,5 +126,6 @@ stdenv.mkDerivation rec { description = "Cross-Platform Makefile Generator"; platforms = if useQt4 then qt4.meta.platforms else platforms.all; maintainers = with maintainers; [ ttuegel lnl7 ]; + license = licenses.bsd3; }; } diff --git a/pkgs/development/tools/build-managers/rebar/default.nix b/pkgs/development/tools/build-managers/rebar/default.nix index b028534f3c869..98cd7e136d225 100644 --- a/pkgs/development/tools/build-managers/rebar/default.nix +++ b/pkgs/development/tools/build-managers/rebar/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation { platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.the-kenny ]; + license = stdenv.lib.licenses.asl20; }; } diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index d9e260a13de3e..e96852602fc73 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -122,5 +122,6 @@ stdenv.mkDerivation { platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ gleber tazjin ]; + license = stdenv.lib.licenses.asl20; }; } diff --git a/pkgs/development/tools/build-managers/remake/default.nix b/pkgs/development/tools/build-managers/remake/default.nix index 926cc83cd9767..3eca6f02e45d0 100644 --- a/pkgs/development/tools/build-managers/remake/default.nix +++ b/pkgs/development/tools/build-managers/remake/default.nix @@ -11,6 +11,10 @@ stdenv.mkDerivation rec { sha256 = "1zi16pl7sqn1aa8b7zqm9qnd9vjqyfywqm8s6iap4clf86l7kss2"; }; + patches = [ + ./glibc-2.27-glob.patch + ]; + buildInputs = [ readline ]; meta = { diff --git a/pkgs/development/tools/build-managers/remake/glibc-2.27-glob.patch b/pkgs/development/tools/build-managers/remake/glibc-2.27-glob.patch new file mode 100644 index 0000000000000..ef876e2fb2377 --- /dev/null +++ b/pkgs/development/tools/build-managers/remake/glibc-2.27-glob.patch @@ -0,0 +1,34 @@ +diff --git a/glob/glob.c b/glob/glob.c +index f3911bcd861..6cb76e8e162 100644 +--- a/glob/glob.c ++++ b/glob/glob.c +@@ -208,29 +208,8 @@ my_realloc (p, n) + #endif /* __GNU_LIBRARY__ || __DJGPP__ */ + + +-#if !defined __alloca && !defined __GNU_LIBRARY__ +- +-# ifdef __GNUC__ +-# undef alloca +-# define alloca(n) __builtin_alloca (n) +-# else /* Not GCC. */ +-# ifdef HAVE_ALLOCA_H +-# include <alloca.h> +-# else /* Not HAVE_ALLOCA_H. */ +-# ifndef _AIX +-# ifdef WINDOWS32 +-# include <malloc.h> +-# else +-extern char *alloca (); +-# endif /* WINDOWS32 */ +-# endif /* Not _AIX. */ +-# endif /* sparc or HAVE_ALLOCA_H. */ +-# endif /* GCC. */ +- + # define __alloca alloca + +-#endif +- + #ifndef __GNU_LIBRARY__ + # define __stat stat + # ifdef STAT_MACROS_BROKEN diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/development/tools/build-managers/waf/default.nix index e86d61cf6c9a1..5c6283b00a154 100644 --- a/pkgs/development/tools/build-managers/waf/default.nix +++ b/pkgs/development/tools/build-managers/waf/default.nix @@ -1,15 +1,17 @@ -{ stdenv, fetchurl, python2 }: +{ stdenv, fetchFromGitLab, python, ensureNewerSourcesForZipFilesHook }: stdenv.mkDerivation rec { name = "waf-${version}"; - version = "2.0.6"; + version = "2.0.10"; - src = fetchurl { - url = "https://waf.io/waf-${version}.tar.bz2"; - sha256 = "1wyl0jl10i0p2rj49sig5riyppgkqlkqmbvv35d5bqxri3y4r38q"; + src = fetchFromGitLab { + owner = "ita1024"; + repo = "waf"; + rev = name; + sha256 = "12p5myq72r5qg7wp2gwbnyvh6lzzcrwp9h3dw194x38g52m0prc7"; }; - buildInputs = [ python2 ]; + buildInputs = [ python ensureNewerSourcesForZipFilesHook ]; configurePhase = '' python waf-light configure @@ -23,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Meta build system"; - homepage = "https://waf.io/"; + homepage = https://waf.io; license = licenses.bsd3; platforms = platforms.all; maintainers = with maintainers; [ vrthra ]; diff --git a/pkgs/development/tools/flootty/default.nix b/pkgs/development/tools/flootty/default.nix index 796c3dc79a09c..1baddb52259cb 100644 --- a/pkgs/development/tools/flootty/default.nix +++ b/pkgs/development/tools/flootty/default.nix @@ -1,22 +1,18 @@ -{ stdenv, python }: +{ stdenv, python3Packages }: -let - inherit (python.pkgs) buildPythonApplication fetchPypi; -in - -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "Flootty"; - version = "3.2.1"; + version = "3.2.2"; - src = fetchPypi { + src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0vjwl6g1bwm6jwp9wjla663cm831zf0rc9361mvpn4imdsfz7hxs"; + sha256 = "0gfl143ly81pmmrcml91yr0ypvwrs5q4s1sfdc0l2qkqpy233ih7"; }; meta = with stdenv.lib; { description = "A collaborative terminal. In practice, it's similar to a shared screen or tmux session"; homepage = "https://floobits.com/help/flootty"; license = licenses.asl20; - maintainers = with maintainers; [ sellout ]; + maintainers = with maintainers; [ sellout enzime ]; }; } diff --git a/pkgs/development/tools/goa/default.nix b/pkgs/development/tools/goa/default.nix index 04c35f7b8bb7b..dfb603d101fc1 100644 --- a/pkgs/development/tools/goa/default.nix +++ b/pkgs/development/tools/goa/default.nix @@ -8,32 +8,12 @@ buildGoPackage rec { subPackages = [ "goagen" ]; src = fetchFromGitHub { - rev = "v${version}"; owner = "goadesign"; repo = "goa"; + rev = "v${version}"; sha256 = "13401jf907z3qh11h9clb3z0i0fshwkmhx11fq9z6vx01x8x2in1"; }; - buildInputs = [ makeWrapper ]; - - allowGoReference = true; - - outputs = [ "out" ]; - - preInstall = '' - export bin=$out - ''; - - postInstall = '' - # goagen needs GOPATH to be set - wrapProgram $out/bin/goagen \ - --prefix GOPATH ":" $out/share/go - - # and it needs access to all its dependancies - mkdir -p $out/share/go - cp -Rv $NIX_BUILD_TOP/go/{pkg,src} $out/share/go/ - ''; - goDeps = ./deps.nix; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix index daa3713a8d169..2ef6b4a1d5489 100644 --- a/pkgs/development/tools/hcloud/default.nix +++ b/pkgs/development/tools/hcloud/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { name = "hcloud-${version}"; - version = "1.5.0"; + version = "1.6.0"; goPackagePath = "github.com/hetznercloud/cli"; src = fetchFromGitHub { owner = "hetznercloud"; repo = "cli"; rev = "v${version}"; - sha256 = "1pbfa977ihqn7j3ynyqghxjw0wmq0vgha4lsshdpf5xr2n3w0r8l"; + sha256 = "0iswy8xjqvshwk9w2vz3miph953qdh21xga9hl6aili84x25xzbx"; }; buildFlagsArray = [ "-ldflags=" "-w -X github.com/hetznercloud/cli/cli.Version=${version}" ]; diff --git a/pkgs/development/tools/kubectx/default.nix b/pkgs/development/tools/kubectx/default.nix new file mode 100644 index 0000000000000..5cf0badf668e2 --- /dev/null +++ b/pkgs/development/tools/kubectx/default.nix @@ -0,0 +1,38 @@ +{ stdenv, lib, fetchFromGitHub, kubectl, makeWrapper }: + +with lib; + +stdenv.mkDerivation rec { + name = "kubectx"; + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "ahmetb"; + repo = "${name}"; + rev = "v${version}"; + sha256 = "1bmmaj5fffx4hy55l6x4vl5gr9rp2yhg4vs5b9sya9rjvdkamdx5"; + }; + + buildInputs = [ makeWrapper ]; + + dontBuild = true; + doCheck = false; + + installPhase = '' + mkdir -p $out/bin + cp kubectx $out/bin + cp kubens $out/bin + + for f in $out/bin/*; do + wrapProgram $f --prefix PATH : ${makeBinPath [ kubectl ]} + done + ''; + + meta = { + description = "Fast way to switch between clusters and namespaces in kubectl!"; + license = licenses.asl20; + homepage = https://github.com/ahmetb/kubectx; + maintainers = with maintainers; [ periklis ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index 6840bcac0dc58..2020dc93d0f7d 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -30,13 +30,13 @@ let in stdenv.mkDerivation rec { name = "nwjs-${version}"; - version = "0.23.6"; + version = "0.32.1"; src = fetchurl { url = "https://dl.nwjs.io/v${version}/nwjs-v${version}-linux-${bits}.tar.gz"; sha256 = if bits == "x64" then - "0ppyjspdvacarhdn4xd5i1pqgmf4z1bxnh1cry780489h25rcjgj" else - "0c0j73vnzhsry5rdx41d954a29jmjnvzli728cfbjybfr51zdybg"; + "b96fc5af62adf0567cc376c6b90cc401c9216bb01eb4767189208a29fbae5e5b" else + "0a3b712abfa0c3e7e808b1d08ea5d53375a71060e7d144fdcb58c4fe88fa2250"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index 73b7da119abe5..7e84719ae47df 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -87,5 +87,6 @@ in stdenv.mkDerivation rec { homepage = http://opam.ocamlpro.com/; maintainers = [ maintainers.henrytill ]; platforms = platforms.all; + license = licenses.lgpl21Plus; }; } diff --git a/pkgs/development/tools/parsing/antlr/2.7.7.nix b/pkgs/development/tools/parsing/antlr/2.7.7.nix index 519540ef52aef..0c67baa960108 100644 --- a/pkgs/development/tools/parsing/antlr/2.7.7.nix +++ b/pkgs/development/tools/parsing/antlr/2.7.7.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation { walk parse trees. ''; homepage = http://www.antlr.org/; + license = licenses.bsd3; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/parsing/antlr/3.4.nix b/pkgs/development/tools/parsing/antlr/3.4.nix index c892b8fa8eab9..8074b7c35ad9e 100644 --- a/pkgs/development/tools/parsing/antlr/3.4.nix +++ b/pkgs/development/tools/parsing/antlr/3.4.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; unpackPhase = "true"; - + installPhase = '' mkdir -p "$out"/{lib/antlr,bin} cp "$src" "$out/lib/antlr/antlr-${version}-complete.jar" @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { walk parse trees. ''; homepage = http://www.antlr.org/; + license = licenses.bsd3; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/tools/parsing/antlr/3.5.nix b/pkgs/development/tools/parsing/antlr/3.5.nix index 030a19e994050..35179b336026d 100644 --- a/pkgs/development/tools/parsing/antlr/3.5.nix +++ b/pkgs/development/tools/parsing/antlr/3.5.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; unpackPhase = "true"; - + installPhase = '' mkdir -p "$out"/{lib/antlr,bin} cp "$src" "$out/lib/antlr/antlr-${version}-complete.jar" @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { walk parse trees. ''; homepage = http://www.antlr.org/; + license = licenses.bsd3; platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/parsing/antlr/4.7.nix b/pkgs/development/tools/parsing/antlr/4.7.nix index e097b5b3d5a57..1ebf7d7dfe241 100644 --- a/pkgs/development/tools/parsing/antlr/4.7.nix +++ b/pkgs/development/tools/parsing/antlr/4.7.nix @@ -1,41 +1,81 @@ -{stdenv, fetchurl, jre}: +{ stdenv, fetchurl, jre +, fetchFromGitHub, cmake, ninja, pkgconfig, libuuid, darwin }: -stdenv.mkDerivation rec { - name = "antlr-${version}"; +let version = "4.7.1"; - src = fetchurl { - url ="https://www.antlr.org/download/antlr-${version}-complete.jar"; - sha256 = "1236gwnzchama92apb2swmklnypj01m7bdwwfvwvl8ym85scw7gl"; + source = fetchFromGitHub { + owner = "antlr"; + repo = "antlr4"; + rev = version; + sha256 = "1xb4d9bd4hw406v85s64gg8gwcrrsrw171vhga1gz4xj6pzfwxz7"; }; - unpackPhase = "true"; - - installPhase = '' - mkdir -p "$out"/{share/java,bin} - cp "$src" "$out/share/java/antlr-${version}-complete.jar" - - echo "#! ${stdenv.shell}" >> "$out/bin/antlr" - echo "'${jre}/bin/java' -cp '$out/share/java/antlr-${version}-complete.jar:$CLASSPATH' -Xmx500M org.antlr.v4.Tool \"\$@\"" >> "$out/bin/antlr" - - echo "#! ${stdenv.shell}" >> "$out/bin/grun" - echo "'${jre}/bin/java' -cp '$out/share/java/antlr-${version}-complete.jar:$CLASSPATH' org.antlr.v4.gui.TestRig \"\$@\"" >> "$out/bin/grun" - - chmod a+x "$out/bin/antlr" "$out/bin/grun" - ln -s "$out/bin/antlr"{,4} - ''; - - inherit jre; - - meta = with stdenv.lib; { - description = "Powerful parser generator"; - longDescription = '' - ANTLR (ANother Tool for Language Recognition) is a powerful parser - generator for reading, processing, executing, or translating structured - text or binary files. It's widely used to build languages, tools, and - frameworks. From a grammar, ANTLR generates a parser that can build and - walk parse trees. + runtime = { + cpp = stdenv.mkDerivation { + name = "antlr-runtime-cpp-${version}"; + src = source; + + outputs = [ "out" "dev" "doc" ]; + + nativeBuildInputs = [ cmake ninja pkgconfig ]; + buildInputs = stdenv.lib.optional stdenv.isLinux libuuid + ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreFoundation; + + postUnpack = '' + export sourceRoot=$sourceRoot/runtime/Cpp + ''; + + meta = with stdenv.lib; { + description = "C++ target for ANTLR 4"; + homepage = http://www.antlr.org/; + license = licenses.bsd3; + platforms = platforms.unix; + }; + }; + }; + + antlr = stdenv.mkDerivation { + name = "antlr-${version}"; + src = fetchurl { + url ="https://www.antlr.org/download/antlr-${version}-complete.jar"; + sha256 = "1236gwnzchama92apb2swmklnypj01m7bdwwfvwvl8ym85scw7gl"; + }; + + unpackPhase = "true"; + + installPhase = '' + mkdir -p "$out"/{share/java,bin} + cp "$src" "$out/share/java/antlr-${version}-complete.jar" + + echo "#! ${stdenv.shell}" >> "$out/bin/antlr" + echo "'${jre}/bin/java' -cp '$out/share/java/antlr-${version}-complete.jar:$CLASSPATH' -Xmx500M org.antlr.v4.Tool \"\$@\"" >> "$out/bin/antlr" + + echo "#! ${stdenv.shell}" >> "$out/bin/grun" + echo "'${jre}/bin/java' -cp '$out/share/java/antlr-${version}-complete.jar:$CLASSPATH' org.antlr.v4.gui.TestRig \"\$@\"" >> "$out/bin/grun" + + chmod a+x "$out/bin/antlr" "$out/bin/grun" + ln -s "$out/bin/antlr"{,4} ''; - homepage = http://www.antlr.org/; - platforms = platforms.unix; + + inherit jre; + + passthru = { + inherit runtime; + jarLocation = "${antlr}/share/java/antlr-${version}-complete.jar"; + }; + + meta = with stdenv.lib; { + description = "Powerful parser generator"; + longDescription = '' + ANTLR (ANother Tool for Language Recognition) is a powerful parser + generator for reading, processing, executing, or translating structured + text or binary files. It's widely used to build languages, tools, and + frameworks. From a grammar, ANTLR generates a parser that can build and + walk parse trees. + ''; + homepage = http://www.antlr.org/; + license = licenses.bsd3; + platforms = platforms.unix; + }; }; -} +in antlr diff --git a/pkgs/development/tools/sqsh/default.nix b/pkgs/development/tools/sqsh/default.nix index d1b1c84a31364..4acfa4a2b0eda 100644 --- a/pkgs/development/tools/sqsh/default.nix +++ b/pkgs/development/tools/sqsh/default.nix @@ -34,6 +34,7 @@ in stdenv.mkDerivation rec { it is intended as a replacement for the venerable 'isql' program supplied by Sybase. ''; + license = licenses.gpl2; homepage = https://sourceforge.net/projects/sqsh/; platforms = platforms.all; }; diff --git a/pkgs/development/tools/toxiproxy/default.nix b/pkgs/development/tools/toxiproxy/default.nix index 10a27e2e3b88e..565ec7904f186 100644 --- a/pkgs/development/tools/toxiproxy/default.nix +++ b/pkgs/development/tools/toxiproxy/default.nix @@ -22,5 +22,6 @@ buildGoPackage rec { meta = { description = "Proxy for for simulating network conditions."; maintainers = with lib.maintainers; [ avnik ]; + license = lib.licenses.mit; }; } diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix index 9dbdcfaa8aabf..2f5552945714d 100644 --- a/pkgs/development/tools/wp-cli/default.nix +++ b/pkgs/development/tools/wp-cli/default.nix @@ -2,11 +2,11 @@ let name = "wp-cli-${version}"; - version = "1.5.1"; + version = "2.0.0"; src = fetchurl { url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${name}.phar"; - sha256 = "1lnjbl6rcv32g6akj4552ncyqmbsawmx1dnbmxr0rjj7wr8484f1"; + sha256 = "1s8pv8vdjwiwknpwsxc59l1zxc2np7nrp6bjd0s8jwsrv5fgjzsp"; }; completion = fetchurl { @@ -36,9 +36,7 @@ in stdenv.mkDerivation rec { inherit name version; buildCommand = '' - mkdir -p $out/{bin,share/bash-completion/completions} - - ln -s ${bin} $out/bin/wp + install -Dm755 ${bin} $out/bin/wp install -Dm644 ${completion} $out/share/bash-completion/completions/wp # this is a very basic run test diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index 1487ed4e1ddc5..4fcaac90fd63d 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -15,11 +15,11 @@ let runtimeLibs = lib.makeLibraryPath [ libudev0-shim glibc curl openssl nghttp2 ]; in stdenv.mkDerivation rec { name = "insomnia-${version}"; - version = "5.16.6"; + version = "6.0.2"; src = fetchurl { url = "https://github.com/getinsomnia/insomnia/releases/download/v${version}/insomnia_${version}_amd64.deb"; - sha256 = "1acad6gjrldd87nnv2hw558lzwy4c4ijh9jwjxnhz61jmdqvbmxw"; + sha256 = "18xspbaal945bmrwjnsz1sjba53040wxrzvig40nnclwj8h671ms"; }; nativeBuildInputs = [ makeWrapper dpkg ]; diff --git a/pkgs/games/construo/default.nix b/pkgs/games/construo/default.nix index 7db6413673111..38a67289d3914 100644 --- a/pkgs/games/construo/default.nix +++ b/pkgs/games/construo/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { meta = { description = "Masses and springs simulation game"; homepage = http://fs.fsf.org/construo/; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index 66e199a3f0d2f..b444f5b0be0ff 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -5,15 +5,16 @@ stdenv.mkDerivation rec { name = "crawl-${version}${lib.optionalString tileMode "-tiles"}"; - version = "0.21.1"; + version = "0.22.0"; src = fetchFromGitHub { owner = "crawl-ref"; repo = "crawl-ref"; rev = version; - sha256 = "191pmd7vpp9qni5l13fb5s8g1axniah8a6hhi31gp0848c8n7hlh"; + sha256 = "1bzhqrc944rgpdnnid3c5h2r3dvyw70cs70hazzm0cv5aipdkhbl"; }; + # Patch hard-coded paths in the makefile patches = [ ./crawl_purify.patch ]; nativeBuildInputs = [ pkgconfig which perl pngcrush advancecomp ]; @@ -25,9 +26,7 @@ stdenv.mkDerivation rec { preBuild = '' cd crawl-ref/source echo "${version}" > util/release_ver - for i in util/*; do - patchShebangs $i - done + patchShebangs 'util' patchShebangs util/gen-mi-enum rm -rf contrib ''; diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix index 17469777ea415..a90e50fac629e 100644 --- a/pkgs/games/exult/default.nix +++ b/pkgs/games/exult/default.nix @@ -46,5 +46,6 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.unix; hydraPlatforms = stdenv.lib.platforms.linux; # darwin times out + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/ivan/default.nix b/pkgs/games/ivan/default.nix index 3281c3d28d12b..54aa27220923b 100644 --- a/pkgs/games/ivan/default.nix +++ b/pkgs/games/ivan/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { homepage = https://attnam.com/; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [nonfreeblob]; + maintainers = with maintainers; []; }; } diff --git a/pkgs/games/newtonwars/default.nix b/pkgs/games/newtonwars/default.nix index 0fe9d1ee0f57c..c806dfa5b806a 100644 --- a/pkgs/games/newtonwars/default.nix +++ b/pkgs/games/newtonwars/default.nix @@ -33,5 +33,6 @@ stdenv.mkDerivation rec { description = "A space battle game with gravity as the main theme"; maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; + license = licenses.mit; }; } diff --git a/pkgs/games/trackballs/default.nix b/pkgs/games/trackballs/default.nix index 06bd2a8bc4d03..8549a860d8e8f 100644 --- a/pkgs/games/trackballs/default.nix +++ b/pkgs/games/trackballs/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { homepage = https://trackballs.github.io/; description = "3D Marble Madness clone"; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/misc/brightnessctl/default.nix b/pkgs/misc/brightnessctl/default.nix index 69fa10d74fe6e..b8821d335b26c 100644 --- a/pkgs/misc/brightnessctl/default.nix +++ b/pkgs/misc/brightnessctl/default.nix @@ -11,9 +11,10 @@ stdenv.mkDerivation rec { sha256 = "0amxhcikcgj04z81272kz35m5h5q4jx9x7v71h8yl1rv4b2lzh7z"; }; - makeFlags = "MODE=0755 PREFIX=/ DESTDIR=$(out)"; + makeFlags = [ "MODE=0755" "PREFIX=" "DESTDIR=$(out)" ]; + installTargets = [ "install" "install_udev_rules" ]; - patchPhase = '' + postPatch = '' substituteInPlace 90-brightnessctl.rules --replace /bin/ ${coreutils}/bin/ substituteInPlace 90-brightnessctl.rules --replace %k '*' ''; diff --git a/pkgs/misc/emulators/dosbox/unstable.nix b/pkgs/misc/emulators/dosbox/unstable.nix index aecfd7698f07d..e1762d66641a7 100644 --- a/pkgs/misc/emulators/dosbox/unstable.nix +++ b/pkgs/misc/emulators/dosbox/unstable.nix @@ -36,5 +36,6 @@ in stdenv.mkDerivation rec { description = "A DOS emulator"; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ binarin ]; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/misc/phabricator/default.nix b/pkgs/misc/phabricator/default.nix index 367e4e53442e1..0dde5b2b6d7c5 100644 --- a/pkgs/misc/phabricator/default.nix +++ b/pkgs/misc/phabricator/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.asl20; }; } diff --git a/pkgs/os-specific/linux/dmraid/default.nix b/pkgs/os-specific/linux/dmraid/default.nix index a6f6365ae631b..129ccb304564b 100644 --- a/pkgs/os-specific/linux/dmraid/default.nix +++ b/pkgs/os-specific/linux/dmraid/default.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { ''; maintainers = [ stdenv.lib.maintainers.raskin ]; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index f5f73255d291e..5943ced2f8f90 100644 --- a/pkgs/os-specific/linux/hwdata/default.nix +++ b/pkgs/os-specific/linux/hwdata/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "hwdata-${version}"; - version = "0.313"; + version = "0.314"; src = fetchFromGitHub { owner = "vcrhonek"; repo = "hwdata"; rev = "v${version}"; - sha256 = "1mmqiy4ams14mdiakz60dm07wfan343hisiiz0dwvh685mjxap8h"; + sha256 = "12k466ndg152fqld1w5v1zfdyv000yypazcwy75ywlxvlknv4y90"; }; preConfigure = "patchShebangs ./configure"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "0lz8pykpfw6aqkpdaqdc3jnny1iqgsqnc0wm61784xxml7zqfdvx"; + outputHash = "1w00y5kj8rd8slzydw1gw8cablxlkham4vq786kdd8zga286zabb"; meta = { homepage = https://github.com/vcrhonek/hwdata; diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix index 7e277617b61a3..309b5f6c74e83 100644 --- a/pkgs/os-specific/linux/kernel/hardened-config.nix +++ b/pkgs/os-specific/linux/kernel/hardened-config.nix @@ -103,16 +103,17 @@ PAGE_POISONING_ZERO y PANIC_ON_OOPS y PANIC_TIMEOUT -1 -GCC_PLUGINS y # Enable gcc plugin options +${optionalString (versionOlder version "4.18") '' + GCC_PLUGINS y # Enable gcc plugin options + # Gather additional entropy at boot time for systems that may not have appropriate entropy sources. + GCC_PLUGIN_LATENT_ENTROPY y -# Gather additional entropy at boot time for systems that may not have appropriate entropy sources. -GCC_PLUGIN_LATENT_ENTROPY y - -${optionalString (versionAtLeast version "4.11") '' - GCC_PLUGIN_STRUCTLEAK y # A port of the PaX structleak plugin -''} -${optionalString (versionAtLeast version "4.14") '' - GCC_PLUGIN_STRUCTLEAK_BYREF_ALL y # Also cover structs passed by address + ${optionalString (versionAtLeast version "4.11") '' + GCC_PLUGIN_STRUCTLEAK y # A port of the PaX structleak plugin + ''} + ${optionalString (versionAtLeast version "4.14") '' + GCC_PLUGIN_STRUCTLEAK_BYREF_ALL y # Also cover structs passed by address + ''} ''} # Disable various dangerous settings @@ -121,8 +122,10 @@ PROC_KCORE n # Exposes kernel text image layout INET_DIAG n # Has been used for heap based attacks in the past # Use -fstack-protector-strong (gcc 4.9+) for best stack canary coverage. -CC_STACKPROTECTOR_REGULAR n -CC_STACKPROTECTOR_STRONG y +${optionalString (versionOlder version "4.18") '' + CC_STACKPROTECTOR_REGULAR n + CC_STACKPROTECTOR_STRONG y +''} # Enable compile/run-time buffer overflow detection ala glibc's _FORTIFY_SOURCE ${optionalString (versionAtLeast version "4.13") '' diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 9c9957d219306..400574a314462 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.61"; + version = "4.14.62"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1s3h3js073h4ww2dryip91d2lvmgv439ly2vya9x7rvilwhwa3hd"; + sha256 = "1ar29ikway5im17iw9ag1fxivr7sbj8nhxxw347xqmp1irz4vjji"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.17.nix b/pkgs/os-specific/linux/kernel/linux-4.17.nix index b98cf98904e56..fda3b77c0a8bb 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.17.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.17.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.17.13"; + version = "4.17.14"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0x1zas3jwvhjkifh20cwpd2g0glgr8m7h8lqng7awrd116xkw2w2"; + sha256 = "1bxsiishhw6ichifqglkbcmgc0518ih396yi23clvrsfyj6h6in8"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.18.nix b/pkgs/os-specific/linux/kernel/linux-4.18.nix new file mode 100644 index 0000000000000..4f183b696cc06 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-4.18.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: + +with stdenv.lib; + +buildLinux (args // rec { + version = "4.18"; + + # modDirVersion needs to be x.y.z, will automatically add .0 if needed + modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; + + # branchVersion needs to be x.y + extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; + sha256 = "1wgay4k8wj08fc711j290fvi81x75yib8iaa6r7csc7mkvsbrn0r"; + }; +} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 60a4d5a76ed9c..60113959665cb 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.146"; + version = "4.4.147"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1xbxw6yvbjam0xj8j44h730dpf5v94pcf9j7iivcmasgjp61120z"; + sha256 = "06mcilxd5qi8snycb5bhy52icbbwfl056xwmra66yknmpycyad67"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 1863aadf8f1cd..d29855a093ec4 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.118"; + version = "4.9.119"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0myx79rmxgjbr87r815vybmbg6iqgd3nycildrpwsh301kj8kxvx"; + sha256 = "0d8bwsma9j7dhgymcfbchr8k3503w5vp3p18mfqv81x6l40pzqa9"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index 8248a628f0ace..a7e8894ccfefe 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -55,5 +55,6 @@ stdenv.mkDerivation rec { meta = { description = "Library for working with POSIX capabilities"; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/os-specific/linux/psmisc/default.nix b/pkgs/os-specific/linux/psmisc/default.nix index 358fa700382f9..1eec10860f72a 100644 --- a/pkgs/os-specific/linux/psmisc/default.nix +++ b/pkgs/os-specific/linux/psmisc/default.nix @@ -14,5 +14,6 @@ stdenv.mkDerivation rec { homepage = http://psmisc.sourceforge.net/; description = "A set of small useful utilities that use the proc filesystem (such as fuser, killall and pstree)"; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/os-specific/linux/smem/default.nix b/pkgs/os-specific/linux/smem/default.nix index a07eec431c338..ede8d425f12d3 100644 --- a/pkgs/os-specific/linux/smem/default.nix +++ b/pkgs/os-specific/linux/smem/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { description = "A memory usage reporting tool that takes shared memory into account"; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.eelco ]; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/os-specific/linux/statifier/default.nix b/pkgs/os-specific/linux/statifier/default.nix index 67df9dd2f11f1..376ae47ffbe06 100644 --- a/pkgs/os-specific/linux/statifier/default.nix +++ b/pkgs/os-specific/linux/statifier/default.nix @@ -19,5 +19,6 @@ multiStdenv.mkDerivation { meta = with multiStdenv.lib; { description = "Tool for creating static Linux binaries"; platforms = platforms.linux; + license = licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/syscall_limiter/default.nix b/pkgs/os-specific/linux/syscall_limiter/default.nix index a5c69e1d876e0..c7543aee93372 100644 --- a/pkgs/os-specific/linux/syscall_limiter/default.nix +++ b/pkgs/os-specific/linux/syscall_limiter/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "syscall_limiter-${version}"; - version = "20170123"; + version = "2017-01-23"; src = fetchFromGitHub { owner = "vi"; @@ -16,11 +16,7 @@ stdenv.mkDerivation rec { sha256 = "0z5arj1kq1xczgrbw1b8m9kicbv3vs9bd32wvgfr4r6ndingsp5m"; }; - configurePhase = ""; - - buildPhase = '' - make CC="gcc -I${libseccomp}/include -L${libseccomp}/lib" - ''; + buildInputs = [ libseccomp ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index cdb1910d9c0e0..9b0f3ff767c22 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -1,19 +1,19 @@ -{stdenv, fetchFromGitHub, cmake, luajit, kernel, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc}: +{stdenv, fetchFromGitHub, cmake, luajit, kernel, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, elfutils}: with stdenv.lib; stdenv.mkDerivation rec { name = "sysdig-${version}"; - version = "0.21.0"; + version = "0.22.1"; src = fetchFromGitHub { owner = "draios"; repo = "sysdig"; rev = version; - sha256 = "0dakxv2pkbsivavz09fwvav4dla7qzklnv45zb7x306gankkjgi1"; + sha256 = "1wbvpsalm2ccwh8xz6fa4gqviilvjd8lnwvdryixhsdsf7j8w0j0"; }; buildInputs = [ - cmake zlib luajit ncurses perl jsoncpp libb64 openssl curl jq gcc + cmake zlib luajit ncurses perl jsoncpp libb64 openssl curl jq gcc elfutils ] ++ optional (kernel != null) kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { description = "A tracepoint-based system tracing tool for Linux (with clients for other OSes)"; license = licenses.gpl2; maintainers = [maintainers.raskin]; - platforms = platforms.linux ++ platforms.darwin; + platforms = ["x86_64-linux"] ++ platforms.darwin; downloadPage = "https://github.com/draios/sysdig/releases"; }; } diff --git a/pkgs/os-specific/linux/sysvinit/default.nix b/pkgs/os-specific/linux/sysvinit/default.nix index b516cfe65eddd..2e8cf0125e55e 100644 --- a/pkgs/os-specific/linux/sysvinit/default.nix +++ b/pkgs/os-specific/linux/sysvinit/default.nix @@ -33,12 +33,13 @@ stdenv.mkDerivation { rm -rf $out/include rm -rf $out/share/man/man5 rm $(for i in $out/share/man/man8/*; do echo $i; done | grep -v 'pidof\|killall5') - rm $out/bin/{mountpoint,wall} $out/share/man/man1/{mountpoint.1,wall.1} + rm $out/bin/wall $out/share/man/man1/wall.1 ''; meta = { homepage = http://www.nongnu.org/sysvinit/; description = "Utilities related to booting and shutdown"; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/os-specific/linux/trinity/default.nix b/pkgs/os-specific/linux/trinity/default.nix index 46b09dce43797..54d9a9bafe975 100644 --- a/pkgs/os-specific/linux/trinity/default.nix +++ b/pkgs/os-specific/linux/trinity/default.nix @@ -2,17 +2,21 @@ stdenv.mkDerivation rec { name = "trinity-${version}"; - version = "1.8-git-2017-02-13"; + version = "1.8-git-2018-06-08"; src = fetchFromGitHub { owner = "kernelslacker"; repo = "trinity"; - rev = "2989c11ce77bc7bec23da62987e2c3a0dd8a83c9"; - sha256 = "19asyrypjhx2cgjdmwfvmgc0hk3xg00zvgkl89vwxngdb40bkwfq"; + rev = "1b2d43cb383cef86a05acb2df046ce5e9b17a7fe"; + sha256 = "0dsq10vmd6ii1dnpaqhizk9p8mbd6mwgpmi13b11dxwxpcvbhlar"; }; # Fails on 32-bit otherwise - NIX_CFLAGS_COMPILE = "-Wno-error"; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=int-to-pointer-cast" + "-Wno-error=pointer-to-int-cast" + "-Wno-error=incompatible-pointer-types" + ]; postPatch = '' patchShebangs ./configure @@ -21,11 +25,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - installPhase = "make DESTDIR=$out install"; + makeFlags = [ "DESTDIR=$(out)" ]; meta = with stdenv.lib; { description = "A Linux System call fuzz tester"; - homepage = http://codemonkey.org.uk/projects/trinity/; + homepage = https://codemonkey.org.uk/projects/trinity/; license = licenses.gpl2; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/untie/default.nix b/pkgs/os-specific/linux/untie/default.nix index 91443eeced589..739bd44719277 100644 --- a/pkgs/os-specific/linux/untie/default.nix +++ b/pkgs/os-specific/linux/untie/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { description = "A tool to run processes untied from some of the namespaces"; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; + license = licenses.gpl2Plus; }; passthru = { diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index c4af0bec9a231..629f61bf5b167 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { homepage = https://upower.freedesktop.org/; description = "A D-Bus service for power management"; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 3602b772183e9..55758190efd60 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { (lib.withFeature (ncurses != null) "ncursesw") (lib.withFeature (systemd != null) "systemd") (lib.withFeatureAs (systemd != null) - "systemdsystemunitdir" "$bin/lib/systemd/system/") + "systemdsystemunitdir" "$(bin)/lib/systemd/system/") ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "scanf_cv_type_modifier=ms" ; diff --git a/pkgs/os-specific/windows/default.nix b/pkgs/os-specific/windows/default.nix new file mode 100644 index 0000000000000..4621c2da10fbd --- /dev/null +++ b/pkgs/os-specific/windows/default.nix @@ -0,0 +1,29 @@ +{ newScope, crossLibcStdenv }: let + + callPackage = newScope self; + + self = { + cygwinSetup = callPackage ./cygwin-setup { }; + + jom = callPackage ./jom { }; + + w32api = callPackage ./w32api { }; + + mingwrt = callPackage ./mingwrt { }; + mingw_runtime = self.mingwrt; + + mingw_w64 = callPackage ./mingw-w64 { + stdenv = crossLibcStdenv; + }; + + mingw_w64_headers = callPackage ./mingw-w64/headers.nix { }; + + mingw_w64_pthreads = callPackage ./mingw-w64/pthreads.nix { }; + + pthreads = callPackage ./pthread-w32 { }; + + wxMSW = callPackage ./wxMSW-2.8 { }; + + libgnurx = callPackage ./libgnurx { }; + }; +in self diff --git a/pkgs/os-specific/windows/jom/default.nix b/pkgs/os-specific/windows/jom/default.nix index 1b64ad745991e..ee8f007907541 100644 --- a/pkgs/os-specific/windows/jom/default.nix +++ b/pkgs/os-specific/windows/jom/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ flex qmake4Hook ]; QTDIR = qt48; - + # cmakeFlags = "-DWIN32=1 -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_RC_COMPILER=${stdenv.cc.targetPrefix}windres"; preBuild = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' diff --git a/pkgs/os-specific/windows/libgnurx/default.nix b/pkgs/os-specific/windows/libgnurx/default.nix index f50a0d9f503ee..88af53dd046ec 100644 --- a/pkgs/os-specific/windows/libgnurx/default.nix +++ b/pkgs/os-specific/windows/libgnurx/default.nix @@ -8,4 +8,8 @@ in stdenv.mkDerivation rec { url = "mirror://sourceforge/mingw/Other/UserContributed/regex/mingw-regex-${version}/mingw-${name}-src.tar.gz"; sha256 = "0xjxcxgws3bblybw5zsp9a4naz2v5bs1k3mk8dw00ggc0vwbfivi"; }; + + meta = { + platforms = stdenv.lib.platforms.windows; + }; } diff --git a/pkgs/os-specific/windows/mingw-headers/default.nix b/pkgs/os-specific/windows/mingw-headers/default.nix deleted file mode 100644 index c6941ef01f0a7..0000000000000 --- a/pkgs/os-specific/windows/mingw-headers/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{stdenv, mingw_runtime_headers, w32api_headers}: - -stdenv.mkDerivation { - name = "mingw-headers"; - - phases = [ "installPhase" ]; - - installPhase = '' - mkdir -p $out/include - cp -R ${mingw_runtime_headers}/include/* $out/include - cp -R ${w32api_headers}/include/* $out/include - ''; -} diff --git a/pkgs/os-specific/windows/mingw-w64/common.nix b/pkgs/os-specific/windows/mingw-w64/common.nix deleted file mode 100644 index 102d9489fe9ff..0000000000000 --- a/pkgs/os-specific/windows/mingw-w64/common.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ fetchurl }: - -rec { - version = "5.0.3"; - name = "mingw-w64-${version}"; - - src = fetchurl { - url = "mirror://sourceforge/mingw-w64/mingw-w64-v${version}.tar.bz2"; - sha256 = "1d4wrjfdlq5xqpv9zg6ssw4lm8jnv6522xf7d6zbjygmkswisq1a"; - }; - - configureFlags = [ - "--enable-idl" - "--enable-secure-api" - ]; -} diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix index 53050435256fb..a7d4f09b90e97 100644 --- a/pkgs/os-specific/windows/mingw-w64/default.nix +++ b/pkgs/os-specific/windows/mingw-w64/default.nix @@ -1,8 +1,26 @@ -{ stdenv, callPackage, windows }: +{ stdenv, windows, fetchurl }: + +let + version = "5.0.4"; +in stdenv.mkDerivation { + name = "mingw-w64-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/mingw-w64/mingw-w64-v${version}.tar.bz2"; + sha256 = "00zq3z1hbzd5yzmskskjg79xrzwsqx7ihyprfaxy4hb897vf29sm"; + }; + + configureFlags = [ + "--enable-idl" + "--enable-secure-api" + ]; -stdenv.mkDerivation { - inherit (callPackage ./common.nix {}) name src; buildInputs = [ windows.mingw_w64_headers ]; dontStrip = true; hardeningDisable = [ "stackprotector" "fortify" ]; + patches = [ ./osvi.patch ]; + + meta = { + platforms = stdenv.lib.platforms.windows; + }; } diff --git a/pkgs/os-specific/windows/mingw-w64/headers.nix b/pkgs/os-specific/windows/mingw-w64/headers.nix index 03dbf712e2e51..6a93cea670805 100644 --- a/pkgs/os-specific/windows/mingw-w64/headers.nix +++ b/pkgs/os-specific/windows/mingw-w64/headers.nix @@ -1,13 +1,13 @@ -{ stdenvNoCC, callPackage }: +{ stdenvNoCC, mingw_w64 }: -let - inherit (callPackage ./common.nix {}) name src; +stdenvNoCC.mkDerivation { + name = "${mingw_w64.name}-headers"; + inherit (mingw_w64) src meta; -in stdenvNoCC.mkDerivation { - name = name + "-headers"; - inherit src; + patches = [ ./osvi.patch ]; preConfigure = '' cd mingw-w64-headers ''; + } diff --git a/pkgs/os-specific/windows/mingw-w64/osvi.patch b/pkgs/os-specific/windows/mingw-w64/osvi.patch new file mode 100644 index 0000000000000..c51ff4bd5dfda --- /dev/null +++ b/pkgs/os-specific/windows/mingw-w64/osvi.patch @@ -0,0 +1,14 @@ +Fix `error: osvi undeclared (first use in this function)' issue. + +See: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=863064 +--- a/mingw-w64-headers/include/multimon.h ++++ b/mingw-w64-headers/include/multimon.h +@@ -127,7 +127,7 @@ + WINBOOL IsPlatformNT() { + OSVERSIONINFOA oi = { 0 }; + +- oi.dwOSVersionInfoSize = sizeof (osvi); ++ oi.dwOSVersionInfoSize = sizeof (oi); + GetVersionExA ((OSVERSIONINFOA *) &oi); + return (oi.dwPlatformId == VER_PLATFORM_WIN32_NT); + } \ No newline at end of file diff --git a/pkgs/os-specific/windows/mingw-w64/pthreads.nix b/pkgs/os-specific/windows/mingw-w64/pthreads.nix index 1a33e8db07e81..bbcb028d3cbb6 100644 --- a/pkgs/os-specific/windows/mingw-w64/pthreads.nix +++ b/pkgs/os-specific/windows/mingw-w64/pthreads.nix @@ -1,11 +1,8 @@ -{ stdenv, callPackage }: +{ stdenv, mingw_w64 }: -let - inherit (callPackage ./common.nix {}) name src; - -in stdenv.mkDerivation { - name = name + "-pthreads"; - inherit src; +stdenv.mkDerivation { + name = "${mingw_w64.name}-pthreads"; + inherit (mingw_w64) src meta; preConfigure = '' cd mingw-w64-libraries/winpthreads diff --git a/pkgs/os-specific/windows/mingwrt/common.nix b/pkgs/os-specific/windows/mingwrt/common.nix deleted file mode 100644 index 7dc2ae56aa849..0000000000000 --- a/pkgs/os-specific/windows/mingwrt/common.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ lib, fetchurl }: - -rec { - name = "mingwrt-3.20"; - - src = fetchurl { - url = "mirror://sourceforge/mingw/MinGW/Base/mingw-rt/${name}-mingw32-src.tar.gz"; - sha256 = "02pydg1m8y35nxb4k34nlb5c341y2waq76z42mgdzlcf661r91pi"; - }; - - meta.platforms = [ lib.systems.inspect.isMinGW ]; -} diff --git a/pkgs/os-specific/windows/mingwrt/default.nix b/pkgs/os-specific/windows/mingwrt/default.nix index 3429f7564adee..416ae7624c33b 100644 --- a/pkgs/os-specific/windows/mingwrt/default.nix +++ b/pkgs/os-specific/windows/mingwrt/default.nix @@ -1,7 +1,17 @@ -{ stdenv, callPackage }: +{ stdenv, lib, fetchurl }: + +stdenv.mkDerivation rec { + name = "mingwrt-5.0.2"; + + src = fetchurl { + url = "mirror://sourceforge/mingw/MinGW/Base/mingw-rt/${name}-mingw32-src.tar.gz"; + sha256 = "02pydg1m8y35nxb4k34nlb5c341y2waq76z42mgdzlcf661r91p0"; + }; + + meta = { + platforms = lib.platforms.windows; + }; -stdenv.mkDerivation { - inherit (callPackage ./common.nix {}) name src meta; dontStrip = true; hardeningDisable = [ "stackprotector" "fortify" ]; } diff --git a/pkgs/os-specific/windows/mingwrt/headers.nix b/pkgs/os-specific/windows/mingwrt/headers.nix deleted file mode 100644 index 51180af0fc731..0000000000000 --- a/pkgs/os-specific/windows/mingwrt/headers.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenvNoCC, callPackage }: - -let - inherit (callPackage ./common.nix {}) name src meta; - -in stdenvNoCC.mkDerivation { - name = name + "-headers"; - - inherit src meta; - - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' - mkdir -p $out - cp -R include $out - ''; -} diff --git a/pkgs/os-specific/windows/pthread-w32/default.nix b/pkgs/os-specific/windows/pthread-w32/default.nix index 7cd414a97b086..e84270270f8aa 100644 --- a/pkgs/os-specific/windows/pthread-w32/default.nix +++ b/pkgs/os-specific/windows/pthread-w32/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, hostPlatform, buildPlatform }: +{ fetchurl, stdenv, hostPlatform, buildPlatform, mingwrt }: # This file is tweaked for cross-compilation only. assert hostPlatform != buildPlatform; @@ -18,7 +18,7 @@ stdenv.mkDerivation { s/dlltool/i686-pc-mingw32-dlltool/g' ''; - buildInputs = [ mingw_headers ]; + buildInputs = [ mingwrt ]; buildPhase = "make GC"; # to build the GNU C dll with C cleanup code diff --git a/pkgs/os-specific/windows/w32api/common.nix b/pkgs/os-specific/windows/w32api/common.nix deleted file mode 100644 index 273ae2c8df4b9..0000000000000 --- a/pkgs/os-specific/windows/w32api/common.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ fetchurl, xz }: - -rec { - name = "w32api-3.17-2"; - - src = fetchurl { - url = "mirror://sourceforge/mingw/MinGW/Base/w32api/w32api-3.17/${name}-mingw32-src.tar.lzma"; - sha256 = "09rhnl6zikmdyb960im55jck0rdy5z9nlg3akx68ixn7khf3j8wb"; - }; - - nativeBuildInputs = [ xz ]; - - meta.platforms = [ lib.systems.inspect.isMinGW ]; -} diff --git a/pkgs/os-specific/windows/w32api/default.nix b/pkgs/os-specific/windows/w32api/default.nix index 51b88201998c1..2fe989bb2f49f 100644 --- a/pkgs/os-specific/windows/w32api/default.nix +++ b/pkgs/os-specific/windows/w32api/default.nix @@ -1,6 +1,16 @@ -{ stdenv, callPackage }: +{ stdenv, fetchurl, xz, lib }: + +stdenv.mkDerivation rec { + name = "w32api-3.17-2"; + + src = fetchurl { + url = "mirror://sourceforge/mingw/MinGW/Base/w32api/w32api-3.17/${name}-mingw32-src.tar.lzma"; + sha256 = "09rhnl6zikmdyb960im55jck0rdy5z9nlg3akx68ixn7khf3j8wb"; + }; + + meta = { + platforms = lib.platforms.windows; + }; -stdenv.mkDerivation { - inherit (callPackage ./common.nix {}) name src nativeBuildInputs meta; dontStrip = true; } diff --git a/pkgs/os-specific/windows/w32api/headers.nix b/pkgs/os-specific/windows/w32api/headers.nix deleted file mode 100644 index 3083118bb366c..0000000000000 --- a/pkgs/os-specific/windows/w32api/headers.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenvNoCC, callPackage }: - -let - inherit (callPackage ./common.nix {}) name src meta; - -in stdenvNoCC.mkDerivation { - name = name + "-headers"; - - inherit src nativeBuildInputs meta; - - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' - mkdir -p $out - cp -R include $out - ''; -} diff --git a/pkgs/os-specific/windows/wxMSW-2.8/default.nix b/pkgs/os-specific/windows/wxMSW-2.8/default.nix index 8770140cc6335..748bf39a1f201 100644 --- a/pkgs/os-specific/windows/wxMSW-2.8/default.nix +++ b/pkgs/os-specific/windows/wxMSW-2.8/default.nix @@ -2,8 +2,6 @@ , hostPlatform }: -assert hostPlatform.isWindows; - stdenv.mkDerivation { name = "wxMSW-2.8.11"; @@ -32,4 +30,8 @@ stdenv.mkDerivation { "; passthru = {inherit compat24 compat26 unicode;}; + + meta = { + platforms = stdenv.lib.platforms.windows; + }; } diff --git a/pkgs/servers/diod/default.nix b/pkgs/servers/diod/default.nix index a233b6ba4cf8e..eba73b2692a23 100644 --- a/pkgs/servers/diod/default.nix +++ b/pkgs/servers/diod/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { description = "An I/O forwarding server that implements a variant of the 9P protocol"; maintainers = [ stdenv.lib.maintainers.rickynils]; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/servers/ftp/vsftpd/default.nix b/pkgs/servers/ftp/vsftpd/default.nix index 2386acf1b79ad..cc7493f9533c0 100644 --- a/pkgs/servers/ftp/vsftpd/default.nix +++ b/pkgs/servers/ftp/vsftpd/default.nix @@ -46,5 +46,6 @@ stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/servers/jetbrains/youtrack.nix b/pkgs/servers/jetbrains/youtrack.nix index 7e368bf295b68..0518a78f9d6bc 100644 --- a/pkgs/servers/jetbrains/youtrack.nix +++ b/pkgs/servers/jetbrains/youtrack.nix @@ -1,28 +1,29 @@ -{ stdenv, fetchurl, makeWrapper, jre }: +{ stdenv, fetchurl, makeWrapper, jre, gawk }: stdenv.mkDerivation rec { name = "youtrack-${version}"; - version = "2018.1.41051"; + version = "2018.2.44329"; jar = fetchurl { url = "https://download.jetbrains.com/charisma/${name}.jar"; - sha256 = "1sznay3lbyb2i977103hzh61rw1bpkdv0raffbir68apmvv1r0rb"; + sha256 = "1fnnpyikr1x443vxy6f7vlv550sbahpps8awyn13jpg7kpgfm7lk"; }; buildInputs = [ makeWrapper ]; - unpackPhase = "true"; + unpackPhase = ":"; installPhase = '' runHook preInstall - makeWrapper ${jre}/bin/java $out/bin/youtrack --add-flags "\$YOUTRACK_JVM_OPTS -jar $jar" + makeWrapper ${jre}/bin/java $out/bin/youtrack \ + --add-flags "\$YOUTRACK_JVM_OPTS -jar $jar" \ + --prefix PATH : "${stdenv.lib.makeBinPath [ gawk ]}" \ + --set JRE_HOME ${jre} runHook postInstall ''; meta = with stdenv.lib; { - description = '' - Issue Tracking and Project Management Tool for Developers - ''; + description = "Issue tracking and project management tool for developers"; maintainers = with maintainers; [ yorickvp ]; # https://www.jetbrains.com/youtrack/buy/license.html license = licenses.unfree; diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix index 02a6197d38461..bb86e59e4c337 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -1,6 +1,8 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGo19Package, fetchFromGitHub }: -buildGoPackage rec { +# Go 1.10 causes segfaults: +# https://github.com/prometheus/node_exporter/issues/870 +buildGo19Package rec { name = "node_exporter-${version}"; version = "0.16.0"; rev = "v${version}"; diff --git a/pkgs/servers/monitoring/uchiwa/default.nix b/pkgs/servers/monitoring/uchiwa/default.nix index e7cf3e8f70e48..1de1edfa8e11b 100644 --- a/pkgs/servers/monitoring/uchiwa/default.nix +++ b/pkgs/servers/monitoring/uchiwa/default.nix @@ -15,6 +15,7 @@ let goPackagePath = "github.com/${owner}/${repo}"; inherit src; postInstall = '' + mkdir $out cp go/src/github.com/sensu/uchiwa/public/index.html $out/ ''; }; diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 51df7c18a1e6d..ab2ff85939f6d 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, lua }: stdenv.mkDerivation rec { - version = "4.0.10"; + version = "4.0.11"; name = "redis-${version}"; src = fetchurl { url = "http://download.redis.io/releases/${name}.tar.gz"; - sha256 = "194cydhv3hf4v95ifvjvsqrs4jn3ffrkg5lvxj5d3y04lwsp9dhx"; + sha256 = "1fqvxlpaxr80iykyvpf1fia8rxh4zz8paf5nnjncsssqwwxfflzw"; }; buildInputs = [ lua ]; diff --git a/pkgs/servers/nosql/riak/2.2.0.nix b/pkgs/servers/nosql/riak/2.2.0.nix index b041aa9f35fc7..a09b4543cbbee 100644 --- a/pkgs/servers/nosql/riak/2.2.0.nix +++ b/pkgs/servers/nosql/riak/2.2.0.nix @@ -92,5 +92,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ cstrahan mdaiter ]; description = "Dynamo inspired NoSQL DB by Basho"; platforms = [ "x86_64-linux" ]; + license = licenses.asl20; }; } diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index d8c8682d504e2..a609476c41aa6 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "groonga-${version}"; - version = "8.0.2"; + version = "8.0.5"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/${name}.tar.gz"; - sha256 = "0bsf4dbgbddij49xg6d6kl9kb1m5ywdyc1w1xz2giisqk1hdwsz4"; + sha256 = "1w7yygqp089kmiznxrwhvyny8cfdb4lr2pazh4873r8xxb9dyfvn"; }; buildInputs = with stdenv.lib; diff --git a/pkgs/servers/skydns/default.nix b/pkgs/servers/skydns/default.nix index 7bfea23c78b5a..82d79785b11ce 100644 --- a/pkgs/servers/skydns/default.nix +++ b/pkgs/servers/skydns/default.nix @@ -1,4 +1,4 @@ -{ buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "skydns-${version}"; @@ -15,4 +15,8 @@ buildGoPackage rec { }; goDeps = ./deps.nix; + + meta = { + license = stdenv.lib.licenses.mit; + }; } diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix index 146d9d23198bf..723b4e4d8d3e7 100644 --- a/pkgs/servers/sql/mysql/5.7.x.nix +++ b/pkgs/servers/sql/mysql/5.7.x.nix @@ -7,11 +7,11 @@ let self = stdenv.mkDerivation rec { name = "mysql-${version}"; - version = "5.7.22"; + version = "5.7.23"; src = fetchurl { url = "mirror://mysql/MySQL-5.7/${name}.tar.gz"; - sha256 = "1wng15j5caz6fsv28avlcxjgq3c5n90ifk79xa0h7jws19dl1f2f"; + sha256 = "0rbc3xsc11lq2dm0ip6gxa16c06hi74scb97x5cw7yhbabaz4c07"; }; preConfigure = stdenv.lib.optional stdenv.isDarwin '' diff --git a/pkgs/servers/sql/postgresql/cstore_fdw/default.nix b/pkgs/servers/sql/postgresql/cstore_fdw/default.nix index 70b8abf2502d3..b6b9f3a5650f5 100644 --- a/pkgs/servers/sql/postgresql/cstore_fdw/default.nix +++ b/pkgs/servers/sql/postgresql/cstore_fdw/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "cstore_fdw-${version}"; - version = "1.6.0"; + version = "1.6.1"; nativeBuildInputs = [ protobufc ]; buildInputs = [ postgresql ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "citusdata"; repo = "cstore_fdw"; rev = "refs/tags/v${version}"; - sha256 = "08jbx4hs2r742flilydp0ajjwv8ffnvq82nidh48irrfa4i7n0l0"; + sha256 = "1cpkpbv4c82l961anzwp74r1jc8f0n5z5cvwy4lyrqg5jr501nd4"; }; installPhase = '' diff --git a/pkgs/servers/web-apps/morty/default.nix b/pkgs/servers/web-apps/morty/default.nix index eeb19f81c54d7..e4dd9b0f2dc7c 100644 --- a/pkgs/servers/web-apps/morty/default.nix +++ b/pkgs/servers/web-apps/morty/default.nix @@ -17,6 +17,7 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = "https://github.com/asciimoo/morty"; maintainers = with maintainers; [ leenaars ]; + license = licenses.agpl3; description = "Privacy aware web content sanitizer proxy as a service"; longDescription = '' Morty is a web content sanitizer proxy as a service. It rewrites web diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/pkgs/servers/web-apps/shaarli/default.nix index cee098db6b277..247270f67c50f 100644 --- a/pkgs/servers/web-apps/shaarli/default.nix +++ b/pkgs/servers/web-apps/shaarli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "shaarli-${version}"; - version = "0.9.7"; + version = "0.10.0"; src = fetchurl { url = "https://github.com/shaarli/Shaarli/releases/download/v${version}/shaarli-v${version}-full.tar.gz"; - sha256 = "191nnk4p6cpbljij1a30mpidqdvcwn1x6ndb4lgkqwbpnh86q57l"; + sha256 = "0j7i8ifzjg1s9y8nw4j0as0wdns06zdsjgr99137y9rz5w223pp6"; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 0023c2c070a53..b1a749c7ec4a7 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -426,6 +426,10 @@ in ''; }; + xlsfonts = attrs: attrs // { + meta = attrs.meta // { license = lib.licenses.mit; }; + }; + xorgserver = with xorg; attrs_passed: # exchange attrs if abiCompat is set let diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index e0654e131dca0..a9b34824e494c 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -4,8 +4,8 @@ let platformString = if stdenv.isDarwin then "osx" else if stdenv.isLinux then "linux" else throw "unsupported platform"; - platformSha = if stdenv.isDarwin then "1ga4p8xmrxa54v2s6i0q1q7lx2idcmp1jwm0g4jxr54fyn5ay3lf" - else if stdenv.isLinux then "1bv1yjk3rm1czibqagmh719m4r1x8j8bmh3nw40x7izm2sx0qg7v" + platformSha = if stdenv.isDarwin then "01j92myljgphf68la9q753m5wgfmd0kwlsk441yic7qshcly5xkw" + else if stdenv.isLinux then "0al1mrlz3m5ksnq86mqm0axb8bjdxa05j2p5y9bmcykrgkdwi3vk" else throw "unsupported platform"; platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" else if stdenv.isLinux then "LD_LIBRARY_PATH" @@ -14,7 +14,7 @@ let platformString = if stdenv.isDarwin then "osx" in stdenv.mkDerivation rec { name = "powershell-${version}"; - version = "6.0.3"; + version = "6.0.4"; src = fetchzip { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-${platformString}-x64.tar.gz"; diff --git a/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix b/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix index 6dea51a487e94..c4d63bd277102 100644 --- a/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix +++ b/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, zsh }: stdenv.mkDerivation { name = "lambda-mod-zsh-theme-unstable-2017-10-08"; @@ -10,9 +10,13 @@ stdenv.mkDerivation { rev = "61c373c8aa5556d51522290b82ad44e7166bced1"; }; + buildInputs = [ zsh ]; + installPhase = '' - mkdir -p $out/share/themes - cp lambda-mod.zsh-theme $out/share/themes + chmod +x lambda-mod.zsh-theme # only executable scripts are found by `patchShebangs` + patchShebangs . + + install -Dm0644 lambda-mod.zsh-theme $out/share/zsh/themes/lambda-mod.zsh-theme ''; meta = with stdenv.lib; { diff --git a/pkgs/shells/zsh/nix-zsh-completions/default.nix b/pkgs/shells/zsh/nix-zsh-completions/default.nix index 3c4c3fabfd100..4405902ec3e03 100644 --- a/pkgs/shells/zsh/nix-zsh-completions/default.nix +++ b/pkgs/shells/zsh/nix-zsh-completions/default.nix @@ -15,15 +15,16 @@ stdenv.mkDerivation rec { }; installPhase = '' - mkdir -p $out/share/zsh/site-functions + mkdir -p $out/share/zsh/{site-functions,plugins/nix} cp _* $out/share/zsh/site-functions + cp *.zsh $out/share/zsh/plugins/nix ''; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/spwhitt/nix-zsh-completions; description = "ZSH completions for Nix, NixOS, and NixOps"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.spwhitt stdenv.lib.maintainers.olejorgenb stdenv.lib.maintainers.hedning ]; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ spwhitt olejorgenb hedning ma27 ]; }; } diff --git a/pkgs/tools/X11/xmacro/default.nix b/pkgs/tools/X11/xmacro/default.nix index e986b46aa4872..fee601d157505 100644 --- a/pkgs/tools/X11/xmacro/default.nix +++ b/pkgs/tools/X11/xmacro/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index afc9b44d42f23..1d0d499db03c9 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -7,6 +7,8 @@ let pname = "ansible"; inherit version; + outputs = [ "out" "man" ]; + src = fetchurl { url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; inherit sha256; @@ -16,6 +18,12 @@ let sed -i "s,/usr/,$out," lib/ansible/constants.py ''; + postInstall = '' + for m in docs/man/man1/*; do + install -vD $m -t $man/share/man/man1 + done + ''; + doCheck = false; dontStrip = true; dontPatchELF = true; diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index 6cabd8ff976bd..4d8b2477ed58e 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -47,5 +47,6 @@ stdenv.mkDerivation rec { # license = stdenv.lib.licenses.lgpl21Plus; + "unRAR restriction" platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.raskin ]; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index 0d11ba394e6b6..fe2f771c7227b 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "borgbackup"; - version = "1.1.6"; + version = "1.1.7"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "a1d2e474c85d3ad3d59b3f8209b5549653c88912082ea0159d27a2e80c910930"; + sha256 = "f7b51a132e9edfbe1cacb4f478b28caf3622d79fffcb369bdae9f92d8c8a7fdc"; }; nativeBuildInputs = with python3Packages; [ @@ -50,11 +50,22 @@ python3Packages.buildPythonApplication rec { cp scripts/shell_completions/zsh/_borg $out/share/zsh/site-functions/ ''; + checkInputs = with python3Packages; [ + pytest + ]; + + checkPhase = '' + HOME=$(mktemp -d) py.test --pyargs borg.testsuite + ''; + + # 63 failures, needs pytest-benchmark + doCheck = false; + meta = with stdenv.lib; { description = "A deduplicating backup program (attic fork)"; homepage = https://www.borgbackup.org; license = licenses.bsd3; platforms = platforms.unix; # Darwin and FreeBSD mentioned on homepage - maintainers = with maintainers; [ flokli ]; + maintainers = with maintainers; [ flokli dotlambda ]; }; } diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix index 928494667f14f..73463bbef8978 100644 --- a/pkgs/tools/bootloaders/refind/default.nix +++ b/pkgs/tools/bootloaders/refind/default.nix @@ -117,6 +117,7 @@ stdenv.mkDerivation rec { homepage = http://refind.sourceforge.net/; maintainers = [ maintainers.AndersonTorres ]; platforms = [ "i686-linux" "x86_64-linux" ]; + license = licenses.gpl3Plus; }; } diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/pkgs/tools/cd-dvd/brasero/default.nix index 9587416a96af0..753bdd49959c1 100644 --- a/pkgs/tools/cd-dvd/brasero/default.nix +++ b/pkgs/tools/cd-dvd/brasero/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { description = "A Gnome CD/DVD Burner"; homepage = https://wiki.gnome.org/Apps/Brasero; maintainers = [ maintainers.bdimcheff ]; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } diff --git a/pkgs/tools/cd-dvd/brasero/wrapper.nix b/pkgs/tools/cd-dvd/brasero/wrapper.nix index 839cc1d604e64..7f97209a4aa92 100644 --- a/pkgs/tools/cd-dvd/brasero/wrapper.nix +++ b/pkgs/tools/cd-dvd/brasero/wrapper.nix @@ -12,4 +12,6 @@ in symlinkJoin { wrapProgram $out/bin/brasero \ --prefix PATH ':' ${binPath} ''; + + inherit (brasero-original) meta; } diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix index dc6bcca597bd5..bc79577ab2b56 100644 --- a/pkgs/tools/filesystems/dosfstools/default.nix +++ b/pkgs/tools/filesystems/dosfstools/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { repositories.git = git://daniel-baumann.ch/git/software/dosfstools.git; homepage = https://www.daniel-baumann.ch/software/dosfstools/; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix index b7cccae0f38d3..187e77533f524 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; description = "FUSE-based filesystem that allows remote filesystems to be mounted over SSH"; platforms = platforms.linux; + license = licenses.gpl2; maintainers = with maintainers; [ primeos ]; }; } diff --git a/pkgs/tools/filesystems/vmfs-tools/default.nix b/pkgs/tools/filesystems/vmfs-tools/default.nix index b22f7e07a4648..6cc049a440923 100644 --- a/pkgs/tools/filesystems/vmfs-tools/default.nix +++ b/pkgs/tools/filesystems/vmfs-tools/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { description = "FUSE-based VMFS (vmware) mounting tools"; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; + license = licenses.gpl2; }; } diff --git a/pkgs/tools/graphics/pywal/default.nix b/pkgs/tools/graphics/pywal/default.nix index a83bc845eb9eb..a1d1f21a00712 100644 --- a/pkgs/tools/graphics/pywal/default.nix +++ b/pkgs/tools/graphics/pywal/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "pywal"; - version = "2.0.5"; + version = "3.1.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "117f61db013409ee2657aab9230cc5c2cb2b428c17f7fbcf664909122962165e"; + sha256 = "1i4i9jjnm4f0zhz4nqbb4253517w33bsh5f246n5930hwrr9xn76"; }; # necessary for imagemagick to be found during tests diff --git a/pkgs/tools/graphics/scrot/default.nix b/pkgs/tools/graphics/scrot/default.nix index 49bd74ea412f3..e3c7254457db6 100644 --- a/pkgs/tools/graphics/scrot/default.nix +++ b/pkgs/tools/graphics/scrot/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { description = "A command-line screen capture utility"; platforms = platforms.linux; maintainers = with maintainers; [ garbas ]; + license = licenses.mit; }; } diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index 18699f412847b..4a5a19fefcabf 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "vips-${version}"; - version = "8.6.4"; + version = "8.6.5"; src = fetchurl { url = "https://github.com/jcupitt/libvips/releases/download/v${version}/${name}.tar.gz"; - sha256 = "1x4ai997yfl4155r4k3m5fa5hj3030c4abi5g49kfarbr60a0ca6"; + sha256 = "1nymm4vzscb68aifin9q742ff64b4k4ddppq1060w8hf6h7ay0l7"; }; buildInputs = diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix index cb2076cd21c7a..daebceaf88763 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "ibus-hangul-${version}"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { url = "https://github.com/choehwanjin/ibus-hangul/releases/download/${version}/${name}.tar.gz"; - sha256 = "120p9w7za6hi521hz8q235fkl4i3p1qqr8nqm4a3kxr0pcq40bd2"; + sha256 = "0gha8dfdf54rx8fv3yfikbgdg6lqq6l883lhg7q68ybvkjx9bwbs"; }; buildInputs = [ gtk3 ibus libhangul python3 ]; diff --git a/pkgs/tools/misc/alarm-clock-applet/default.nix b/pkgs/tools/misc/alarm-clock-applet/default.nix index b089240bcc69e..8ee363ed91dcf 100644 --- a/pkgs/tools/misc/alarm-clock-applet/default.nix +++ b/pkgs/tools/misc/alarm-clock-applet/default.nix @@ -1,4 +1,9 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig +{ stdenv, fetchFromGitHub +, pkgconfig +, autoconf +, automake111x +, libtool + , glib , gtk2 , gst_all_1 @@ -15,16 +20,27 @@ stdenv.mkDerivation rec { version = "0.3.4"; name = "alarm-clock-applet-${version}"; - src = fetchurl { - url = "http://launchpad.net/alarm-clock/trunk/${version}/+download/${name}.tar.gz"; - sha256 = "1mrrw5cgv0izdmhdg83vprvbj6062yzk77b2nr1nx6hhmk00946r"; + src = fetchFromGitHub { + owner = "joh"; + repo = "alarm-clock"; + rev = version; + sha256 = "18blvgy8hmw3jidz7xrv9yiiilnzcj65m6wxhw58nrnbcqbpydwn"; }; nativeBuildInputs = [ - makeWrapper pkgconfig + intltool + automake111x + autoconf + libtool + + gnome2.gnome-common + + wrapGAppsHook ]; + preConfigure = "./autogen.sh"; + buildInputs = [ glib gtk2 @@ -34,8 +50,6 @@ stdenv.mkDerivation rec { libnotify libxml2 libunique - intltool - wrapGAppsHook ] ++ gst_plugins; propagatedUserEnvPkgs = [ gnome2.GConf.out ]; diff --git a/pkgs/tools/misc/appdata-tools/default.nix b/pkgs/tools/misc/appdata-tools/default.nix deleted file mode 100644 index 7ceafe127932b..0000000000000 --- a/pkgs/tools/misc/appdata-tools/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, autoconf, automake, m4 -, intltool, glib, libsoup, gdk_pixbuf }: - -stdenv.mkDerivation rec { - version = "0_1_7"; - name = "appdata_tools-${version}"; - - src = fetchurl { - url = "https://github.com/hughsie/appdata-tools/archive/appdata_tools_${version}.tar.gz"; - sha256 = "1bzqg4gy8gqhbk2qjizsm0b78li9mv84fb3d8qwfpxh7c7p360x8"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf automake m4 intltool glib - libsoup gdk_pixbuf ]; - - configureScript = "./autogen.sh"; - - meta = with stdenv.lib; { - homepage = https://people.freedesktop.org/~hughsient/appdata; - description = "CLI designed to validate AppData descriptions for standards compliance and to the style guide"; - platforms = platforms.linux; - license = licenses.gpl2; - maintainers = with maintainers; [ lethalman ]; - }; -} diff --git a/pkgs/tools/misc/convmv/default.nix b/pkgs/tools/misc/convmv/default.nix index 52bcbde1cc1b5..56b9d5c849a5b 100644 --- a/pkgs/tools/misc/convmv/default.nix +++ b/pkgs/tools/misc/convmv/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { description = "Converts filenames from one encoding to another"; platforms = platforms.linux ++ platforms.freebsd ++ platforms.cygwin; maintainers = [ ]; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/tools/misc/diskscan/default.nix b/pkgs/tools/misc/diskscan/default.nix index 9449b7759a8c0..7b97e58fdf969 100644 --- a/pkgs/tools/misc/diskscan/default.nix +++ b/pkgs/tools/misc/diskscan/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { platforms = with platforms; linux; maintainers = with maintainers; [ peterhoeg ]; inherit version; + license = licenses.gpl3; }; } diff --git a/pkgs/tools/misc/disper/default.nix b/pkgs/tools/misc/disper/default.nix index 27bb62c582a53..22951eecf5335 100644 --- a/pkgs/tools/misc/disper/default.nix +++ b/pkgs/tools/misc/disper/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { description = "On-the-fly display switch utility"; homepage = http://willem.engen.nl/projects/disper/; platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/tools/misc/fondu/default.nix b/pkgs/tools/misc/fondu/default.nix index 7610bb88f3903..e31da3bfd2123 100644 --- a/pkgs/tools/misc/fondu/default.nix +++ b/pkgs/tools/misc/fondu/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix index a8d08018c7474..caef0f7b8bb2a 100644 --- a/pkgs/tools/misc/moreutils/default.nix +++ b/pkgs/tools/misc/moreutils/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { homepage = https://joeyh.name/code/moreutils/; maintainers = with maintainers; [ koral pSub ]; platforms = platforms.all; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/tools/misc/multitail/default.nix b/pkgs/tools/misc/multitail/default.nix index 39c9323151f35..48714a4b6e884 100644 --- a/pkgs/tools/misc/multitail/default.nix +++ b/pkgs/tools/misc/multitail/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { description = "tail on Steroids"; maintainers = with stdenv.lib.maintainers; [ ]; platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/misc/opentimestamps-client/default.nix b/pkgs/tools/misc/opentimestamps-client/default.nix index 3fbd874503de6..94984c57e49ce 100644 --- a/pkgs/tools/misc/opentimestamps-client/default.nix +++ b/pkgs/tools/misc/opentimestamps-client/default.nix @@ -1,5 +1,6 @@ { lib, buildPythonApplication, fetchFromGitHub, isPy3k -, opentimestamps, appdirs, GitPython, pysocks }: +, opentimestamps, appdirs, GitPython, pysocks, fetchpatch, git +}: buildPythonApplication rec { pname = "opentimestamps-client"; @@ -15,6 +16,15 @@ buildPythonApplication rec { sha256 = "05m8nllqad3k69mvby5q08y22i0wrj84gqifdgcldimrrn1i00xp"; }; + patches = [ + (fetchpatch { + url = "https://github.com/opentimestamps/opentimestamps-client/commit/1b328269ceee66916e9a639e8d5d7d13cd70d5d8.patch"; + sha256 = "0bd3yalyvk5n4sflw9zilpay5k653ybdgkkfppyrk7c8z3i81hbl"; + }) + ]; + + checkInputs = [ git ]; + propagatedBuildInputs = [ opentimestamps appdirs GitPython pysocks ]; meta = { diff --git a/pkgs/tools/misc/renameutils/default.nix b/pkgs/tools/misc/renameutils/default.nix index f415b76a303de..8b6fec8d0212c 100644 --- a/pkgs/tools/misc/renameutils/default.nix +++ b/pkgs/tools/misc/renameutils/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation { homepage = http://www.nongnu.org/renameutils/; description = "A set of programs to make renaming of files faster"; platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/misc/riemann-tools/default.nix b/pkgs/tools/misc/riemann-tools/default.nix index a20046deafc8b..92e347a044cad 100644 --- a/pkgs/tools/misc/riemann-tools/default.nix +++ b/pkgs/tools/misc/riemann-tools/default.nix @@ -1,8 +1,14 @@ -{ bundlerEnv }: +{ stdenv, bundlerEnv }: bundlerEnv { name = "riemann-tools-0.2.13"; gemfile = ./Gemfile; lockfile = ./Gemfile.lock; gemset = ./gemset.nix; + + meta = { + description = "Tools to submit data to Riemann"; + homepage = "https://riemann.io"; + license = stdenv.lib.licenses.mit; + }; } diff --git a/pkgs/tools/misc/skim/default.nix b/pkgs/tools/misc/skim/default.nix index 31303dcdd4d7d..54a6500f7797a 100644 --- a/pkgs/tools/misc/skim/default.nix +++ b/pkgs/tools/misc/skim/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { name = "skim-${version}"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "lotabout"; repo = "skim"; rev = "v${version}"; - sha256 = "0hk19mqfmrsyx28lb8h1hixivl6zrc8dg3imygk1ppgn66c0zf00"; + sha256 = "1k7l93kvf5ad07yn69vjfv6znwb9v38d53xa1ij195x4img9f34j"; }; outputs = [ "out" "vim" ]; @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { patchPhase = '' sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/skim.vim # fix Cargo.lock version - sed -i -e '168s|0.4.0|0.5.0|' Cargo.lock + sed -i -e '168s|0.4.0|0.5.1|' Cargo.lock ''; postInstall = '' diff --git a/pkgs/tools/misc/uudeview/default.nix b/pkgs/tools/misc/uudeview/default.nix index e66580f25ffb1..3e8b7d494deb5 100644 --- a/pkgs/tools/misc/uudeview/default.nix +++ b/pkgs/tools/misc/uudeview/default.nix @@ -10,6 +10,9 @@ stdenv.mkDerivation rec { buildInputs = [ tcl tk ]; hardeningDisable = [ "format" ]; configureFlags = [ "--enable-tk=${tk.dev}" "--enable-tcl=${tcl}" ]; + + # https://wiki.tcl.tk/3577 + patches = [ ./matherr.patch ]; postPatch = '' substituteInPlace tcl/xdeview --replace "exec uuwish" "exec $out/bin/uuwish" ''; diff --git a/pkgs/tools/misc/uudeview/matherr.patch b/pkgs/tools/misc/uudeview/matherr.patch new file mode 100644 index 0000000000000..a93db7d7858d0 --- /dev/null +++ b/pkgs/tools/misc/uudeview/matherr.patch @@ -0,0 +1,19 @@ +diff --git a/tcl/uutcl.c b/tcl/uutcl.c +index f101f2ce52b..71c24688dc4 100644 +--- a/tcl/uutcl.c ++++ b/tcl/uutcl.c +@@ -48,14 +48,6 @@ + #include <tcl.h> + #endif + +-/* +- * The following variable is a special hack that is needed in order for +- * Sun shared libraries to be used for Tcl. +- */ +- +-extern int matherr(); +-int *tclDummyMathPtr = (int *) matherr; +- + #include <uudeview.h> + #include <uuint.h> + #include <fptools.h> diff --git a/pkgs/tools/misc/wv/default.nix b/pkgs/tools/misc/wv/default.nix index 59efcaa180958..f19d448e5fc26 100644 --- a/pkgs/tools/misc/wv/default.nix +++ b/pkgs/tools/misc/wv/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { meta = { description = "Converter from Microsoft Word formats to human-editable ones"; platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix index 224c7a4ab4840..ac69fd9926585 100644 --- a/pkgs/tools/networking/getmail/default.nix +++ b/pkgs/tools/networking/getmail/default.nix @@ -26,5 +26,6 @@ python2Packages.buildPythonApplication rec { homepage = http://pyropus.ca/software/getmail/; inherit version; updateWalker = true; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/network-manager/applet.nix b/pkgs/tools/networking/network-manager/applet.nix index 52e350c6319e9..0b6a7e622a860 100644 --- a/pkgs/tools/networking/network-manager/applet.nix +++ b/pkgs/tools/networking/network-manager/applet.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, meson, ninja, intltool, gtk-doc, pkgconfig, networkmanager, gnome3 , libnotify, libsecret, polkit, isocodes, modemmanager, libxml2, docbook_xsl , mobile-broadband-provider-info, glib-networking, gsettings-desktop-schemas -, libgudev, hicolor-icon-theme, jansson, wrapGAppsHook, webkitgtk, gobjectIntrospection +, libgudev, jansson, wrapGAppsHook, gobjectIntrospection , libappindicator-gtk3, withGnome ? false }: let @@ -15,27 +15,28 @@ in stdenv.mkDerivation rec { sha256 = "0lmlkh4yyl9smvkgrzshn127zqfbp9f41f448ks8dlhhm38s38v2"; }; + patches = [ + # https://gitlab.gnome.org/GNOME/network-manager-applet/merge_requests/19 + ./libnm-gtk-mbpi.patch + ]; + mesonFlags = [ "-Dselinux=false" "-Dappindicator=yes" "-Dgcr=${if withGnome then "true" else "false"}" ]; - outputs = [ "out" "dev" "devdoc" ]; + outputs = [ "out" "lib" "dev" "devdoc" "man" ]; buildInputs = [ gnome3.gtk networkmanager libnotify libsecret gsettings-desktop-schemas polkit isocodes mobile-broadband-provider-info libgudev modemmanager jansson glib-networking libappindicator-gtk3 - ] ++ stdenv.lib.optionals withGnome [ gnome3.gcr webkitgtk ]; + ] ++ stdenv.lib.optionals withGnome [ gnome3.gcr ]; # advanced certificate chooser nativeBuildInputs = [ meson ninja intltool pkgconfig wrapGAppsHook gobjectIntrospection gtk-doc docbook_xsl libxml2 ]; - propagatedUserEnvPkgs = [ - hicolor-icon-theme - ]; - postPatch = '' chmod +x meson_post_install.py # patchShebangs requires executable file patchShebangs meson_post_install.py diff --git a/pkgs/tools/networking/network-manager/fortisslvpn.nix b/pkgs/tools/networking/network-manager/fortisslvpn.nix deleted file mode 100644 index ab49514d720b9..0000000000000 --- a/pkgs/tools/networking/network-manager/fortisslvpn.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, fetchurl, openfortivpn, automake, autoconf, libtool, intltool, pkgconfig, -networkmanager, ppp, libsecret, withGnome ? true, gnome3 }: - -let - pname = "NetworkManager-fortisslvpn"; - version = "1.2.8"; -in stdenv.mkDerivation rec { - name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "01gvdv9dknvzx05plq863jh1xz1v8vgj5w7v9fmw5v601ggybf4w"; - }; - - buildInputs = [ openfortivpn networkmanager ppp libtool libsecret ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring gnome3.networkmanagerapplet ]; - - nativeBuildInputs = [ automake autoconf intltool pkgconfig ]; - - configureFlags = [ - "${if withGnome then "--with-gnome" else "--without-gnome"}" - "--disable-static" - "--localstatedir=/tmp" - ]; - - preConfigure = '' - substituteInPlace "src/nm-fortisslvpn-service.c" \ - --replace "/bin/openfortivpn" "${openfortivpn}/bin/openfortivpn" - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "networkmanager-fortisslvpn"; - }; - }; - - meta = { - description = "NetworkManager's FortiSSL plugin"; - inherit (networkmanager.meta) maintainers platforms; - }; -} - diff --git a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix new file mode 100644 index 0000000000000..11b29081f9bbc --- /dev/null +++ b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, substituteAll, openfortivpn, intltool, pkgconfig, +networkmanager, ppp, libsecret, withGnome ? true, gnome3 }: + +let + pname = "NetworkManager-fortisslvpn"; + version = "1.2.8"; +in stdenv.mkDerivation rec { + name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "01gvdv9dknvzx05plq863jh1xz1v8vgj5w7v9fmw5v601ggybf4w"; + }; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + inherit openfortivpn; + }) + ]; + + buildInputs = [ openfortivpn networkmanager ppp ] + ++ stdenv.lib.optionals withGnome [ gnome3.gtk libsecret gnome3.networkmanagerapplet ]; + + nativeBuildInputs = [ intltool pkgconfig ]; + + configureFlags = [ + "--with-gnome=${if withGnome then "yes" else "no"}" + "--localstatedir=/tmp" + ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "networkmanager-fortisslvpn"; + }; + }; + + meta = with stdenv.lib; { + description = "NetworkManager's FortiSSL plugin"; + inherit (networkmanager.meta) maintainers platforms; + license = licenses.gpl2; + }; +} + diff --git a/pkgs/tools/networking/network-manager/fortisslvpn/fix-paths.patch b/pkgs/tools/networking/network-manager/fortisslvpn/fix-paths.patch new file mode 100644 index 0000000000000..a1241b6738c23 --- /dev/null +++ b/pkgs/tools/networking/network-manager/fortisslvpn/fix-paths.patch @@ -0,0 +1,11 @@ +--- a/src/nm-fortisslvpn-service.c ++++ b/src/nm-fortisslvpn-service.c +@@ -387,7 +387,7 @@ + { + static const char *openfortivpn_binary_paths[] = + { +- "/bin/openfortivpn", ++ "@openfortivpn@/bin/openfortivpn", + "/usr/bin/openfortivpn", + "/usr/local/bin/openfortivpn", + NULL diff --git a/pkgs/tools/networking/network-manager/iodine.nix b/pkgs/tools/networking/network-manager/iodine.nix deleted file mode 100644 index cbc0e6e6d2d19..0000000000000 --- a/pkgs/tools/networking/network-manager/iodine.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ stdenv, fetchurl, iodine, intltool, pkgconfig, networkmanager, libsecret -, withGnome ? true, gnome3 }: - -let - pname = "NetworkManager-iodine"; - version = "1.2.0"; -in stdenv.mkDerivation rec { - name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0njdigakidji6mfmbsp8lfi8wl88z1dk8cljbva2w0xazyddbwyh"; - }; - - buildInputs = [ iodine networkmanager libsecret ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring - gnome3.networkmanagerapplet ]; - - nativeBuildInputs = [ intltool pkgconfig ]; - - # Fixes deprecation errors with networkmanager 1.10.2 - NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations"; - - configureFlags = [ - "${if withGnome then "--with-gnome" else "--without-gnome"}" - "--disable-static" - "--localstatedir=/" # needed for the management socket under /run/NetworkManager - ]; - - preConfigure = '' - substituteInPlace "src/nm-iodine-service.c" \ - --replace "/usr/bin/iodine" "${iodine}/bin/iodine" - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "networkmanager-iodine"; - }; - }; - - meta = { - description = "NetworkManager's iodine plugin"; - inherit (networkmanager.meta) maintainers platforms; - }; -} diff --git a/pkgs/tools/networking/network-manager/iodine/default.nix b/pkgs/tools/networking/network-manager/iodine/default.nix new file mode 100644 index 0000000000000..a3dbeaf82651f --- /dev/null +++ b/pkgs/tools/networking/network-manager/iodine/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, substituteAll, iodine, intltool, pkgconfig, networkmanager, libsecret +, withGnome ? true, gnome3 }: + +let + pname = "NetworkManager-iodine"; + version = "1.2.0"; +in stdenv.mkDerivation rec { + name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0njdigakidji6mfmbsp8lfi8wl88z1dk8cljbva2w0xazyddbwyh"; + }; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + inherit iodine; + }) + ]; + + buildInputs = [ iodine networkmanager ] + ++ stdenv.lib.optionals withGnome [ gnome3.gtk libsecret gnome3.networkmanagerapplet ]; + + nativeBuildInputs = [ intltool pkgconfig ]; + + # Fixes deprecation errors with networkmanager 1.10.2 + NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations"; + + configureFlags = [ + "--with-gnome=${if withGnome then "yes" else "no"}" + "--localstatedir=/" # needed for the management socket under /run/NetworkManager + ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "networkmanager-iodine"; + }; + }; + + meta = with stdenv.lib; { + description = "NetworkManager's iodine plugin"; + inherit (networkmanager.meta) maintainers platforms; + license = licenses.gpl2Plus; + }; +} diff --git a/pkgs/tools/networking/network-manager/iodine/fix-paths.patch b/pkgs/tools/networking/network-manager/iodine/fix-paths.patch new file mode 100644 index 0000000000000..d32dbfadbafa9 --- /dev/null +++ b/pkgs/tools/networking/network-manager/iodine/fix-paths.patch @@ -0,0 +1,11 @@ +--- a/src/nm-iodine-service.c ++++ b/src/nm-iodine-service.c +@@ -62,7 +62,7 @@ + + static const char *iodine_binary_paths[] = + { +- "/usr/bin/iodine", ++ "@iodine@/bin/iodine", + "/usr/sbin/iodine", + "/usr/local/bin/iodine", + "/usr/local/sbin/iodine", diff --git a/pkgs/tools/networking/network-manager/l2tp.nix b/pkgs/tools/networking/network-manager/l2tp.nix deleted file mode 100644 index 54670ff1bce75..0000000000000 --- a/pkgs/tools/networking/network-manager/l2tp.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, libtool, intltool, pkgconfig -, networkmanager, ppp, xl2tpd, strongswan, libsecret -, withGnome ? true, gnome3, networkmanagerapplet }: - -stdenv.mkDerivation rec { - name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; - pname = "NetworkManager-l2tp"; - version = "1.2.8"; - - src = fetchFromGitHub { - owner = "nm-l2tp"; - repo = "network-manager-l2tp"; - rev = "${version}"; - sha256 = "110157dpamgr7r5kb8aidi0a2ap9z2m52bff94fb4nhxacz69yv8"; - }; - - buildInputs = [ networkmanager ppp libsecret ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring networkmanagerapplet ]; - - nativeBuildInputs = [ autoreconfHook libtool intltool pkgconfig ]; - - postPatch = '' - sed -i -e 's%"\(/usr/sbin\|/usr/pkg/sbin\|/usr/local/sbin\)/[^"]*",%%g' ./src/nm-l2tp-service.c - - substituteInPlace ./Makefile.am \ - --replace '$(sysconfdir)/dbus-1/system.d' "$out/etc/dbus-1/system.d" - - substituteInPlace ./src/nm-l2tp-service.c \ - --replace /sbin/ipsec ${strongswan}/bin/ipsec \ - --replace /sbin/xl2tpd ${xl2tpd}/bin/xl2tpd - ''; - - preConfigure = '' - intltoolize -f - ''; - - configureFlags = [ - "--with-gnome=${if withGnome then "yes" else "no"}" - "--localstatedir=/var" - "--sysconfdir=$(out)/etc" - ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - description = "L2TP plugin for NetworkManager"; - inherit (networkmanager.meta) platforms; - homepage = https://github.com/nm-l2tp/network-manager-l2tp; - license = licenses.gpl2; - maintainers = with maintainers; [ abbradar obadz ]; - }; -} diff --git a/pkgs/tools/networking/network-manager/l2tp/default.nix b/pkgs/tools/networking/network-manager/l2tp/default.nix new file mode 100644 index 0000000000000..d48d2e910f500 --- /dev/null +++ b/pkgs/tools/networking/network-manager/l2tp/default.nix @@ -0,0 +1,48 @@ +{ stdenv, substituteAll, fetchFromGitHub, autoreconfHook, libtool, intltool, pkgconfig +, networkmanager, ppp, xl2tpd, strongswan, libsecret +, withGnome ? true, gnome3, networkmanagerapplet }: + +stdenv.mkDerivation rec { + name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + pname = "NetworkManager-l2tp"; + version = "1.2.10"; + + src = fetchFromGitHub { + owner = "nm-l2tp"; + repo = "network-manager-l2tp"; + rev = "${version}"; + sha256 = "1vm004nj2n5abpywr7ji6r28scf7xs45zw4rqrm8jn7mysf96h0x"; + }; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + inherit strongswan xl2tpd; + }) + ]; + + buildInputs = [ networkmanager ppp ] + ++ stdenv.lib.optionals withGnome [ gnome3.gtk libsecret networkmanagerapplet ]; + + nativeBuildInputs = [ autoreconfHook libtool intltool pkgconfig ]; + + preConfigure = '' + intltoolize -f + ''; + + configureFlags = [ + "--with-gnome=${if withGnome then "yes" else "no"}" + "--localstatedir=/var" + "--sysconfdir=$(out)/etc" + ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "L2TP plugin for NetworkManager"; + inherit (networkmanager.meta) platforms; + homepage = https://github.com/nm-l2tp/network-manager-l2tp; + license = licenses.gpl2; + maintainers = with maintainers; [ abbradar obadz ]; + }; +} diff --git a/pkgs/tools/networking/network-manager/l2tp/fix-paths.patch b/pkgs/tools/networking/network-manager/l2tp/fix-paths.patch new file mode 100644 index 0000000000000..0a068ee800c64 --- /dev/null +++ b/pkgs/tools/networking/network-manager/l2tp/fix-paths.patch @@ -0,0 +1,20 @@ +--- a/src/nm-l2tp-service.c ++++ b/src/nm-l2tp-service.c +@@ -480,7 +480,7 @@ + { + static const char *ipsec_binary_paths[] = + { +- "/sbin/ipsec", ++ "@strongswan@/bin/ipsec", + "/usr/sbin/ipsec", + "/usr/local/sbin/ipsec", + "/sbin/strongswan", +@@ -505,7 +505,7 @@ + { + static const char *l2tp_binary_paths[] = + { +- "/sbin/xl2tpd", ++ "@xl2tpd@/bin/xl2tpd", + "/usr/sbin/xl2tpd", + "/usr/local/sbin/xl2tpd", + NULL diff --git a/pkgs/tools/networking/network-manager/libnm-gtk-mbpi.patch b/pkgs/tools/networking/network-manager/libnm-gtk-mbpi.patch new file mode 100644 index 0000000000000..d7eef5749dbac --- /dev/null +++ b/pkgs/tools/networking/network-manager/libnm-gtk-mbpi.patch @@ -0,0 +1,33 @@ +--- a/meson.build ++++ b/meson.build +@@ -137,7 +137,7 @@ + mobile_broadband_provider_info_dep = dependency('mobile-broadband-provider-info') + config_h.set_quoted('MOBILE_BROADBAND_PROVIDER_INFO_DATABASE', mobile_broadband_provider_info_dep.get_pkgconfig_variable('database')) + else +- config_h.set_quoted('MOBILE_BROADBAND_PROVIDER_INFO_DATABASE', join_paths(nma_prefix, 'share', 'mobile-broadband-provider-info', 'serviceproviders.xml')) ++ config_h.set_quoted('MOBILE_BROADBAND_PROVIDER_INFO_DATABASE', join_paths(nma_datadir, 'mobile-broadband-provider-info', 'serviceproviders.xml')) + endif + + gio_dep = dependency('gio-2.0', version: '>= 2.38') +--- a/src/libnm-gtk/nm-mobile-providers.c ++++ b/src/libnm-gtk/nm-mobile-providers.c +@@ -30,10 +30,6 @@ + + #include "nm-mobile-providers.h" + +-#ifndef MOBILE_BROADBAND_PROVIDER_INFO +-#define MOBILE_BROADBAND_PROVIDER_INFO DATADIR"/mobile-broadband-provider-info/serviceproviders.xml" +-#endif +- + #define ISO_3166_COUNTRY_CODES ISO_CODES_PREFIX"/share/xml/iso-codes/iso_3166.xml" + #define ISO_CODES_LOCALESDIR ISO_CODES_PREFIX"/share/locale" + +@@ -990,7 +986,7 @@ + if (!country_codes) + country_codes = ISO_3166_COUNTRY_CODES; + if (!service_providers) +- service_providers = MOBILE_BROADBAND_PROVIDER_INFO; ++ service_providers = MOBILE_BROADBAND_PROVIDER_INFO_DATABASE; + + countries = read_country_codes (country_codes, + cancellable, diff --git a/pkgs/tools/networking/network-manager/openconnect.nix b/pkgs/tools/networking/network-manager/openconnect/default.nix index ad15723dd3310..23d4c816a20d9 100644 --- a/pkgs/tools/networking/network-manager/openconnect.nix +++ b/pkgs/tools/networking/network-manager/openconnect/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, openconnect, intltool, pkgconfig, networkmanager, libsecret -, withGnome ? true, gnome3, sysctl, kmod }: +{ stdenv, fetchurl, substituteAll, openconnect, intltool, pkgconfig, networkmanager, libsecret +, withGnome ? true, gnome3, kmod }: let pname = "NetworkManager-openconnect"; @@ -12,24 +12,22 @@ in stdenv.mkDerivation rec { sha256 = "15j98wwspv6mcmy91w30as5qc1bzsnhlk060xhjy4qrvd37y0xx1"; }; - buildInputs = [ openconnect networkmanager libsecret ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring ]; + patches = [ + (substituteAll { + src = ./fix-paths.patch; + inherit kmod openconnect; + }) + ]; + + buildInputs = [ openconnect networkmanager ] + ++ stdenv.lib.optionals withGnome [ gnome3.gtk libsecret ]; nativeBuildInputs = [ intltool pkgconfig ]; configureFlags = [ - "${if withGnome then "--with-gnome --with-gtkver=3" else "--without-gnome"}" - "--disable-static" + "--with-gnome=${if withGnome then "yes" else "no"}" ]; - preConfigure = '' - substituteInPlace "configure" \ - --replace "/sbin/sysctl" "${sysctl}/bin/sysctl" - substituteInPlace "src/nm-openconnect-service.c" \ - --replace "/usr/sbin/openconnect" "${openconnect}/bin/openconnect" \ - --replace "/sbin/modprobe" "${kmod}/bin/modprobe" - ''; - passthru = { updateScript = gnome3.updateScript { packageName = pname; @@ -37,8 +35,9 @@ in stdenv.mkDerivation rec { }; }; - meta = { + meta = with stdenv.lib; { description = "NetworkManager's OpenConnect plugin"; inherit (networkmanager.meta) maintainers platforms; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/network-manager/openconnect/fix-paths.patch b/pkgs/tools/networking/network-manager/openconnect/fix-paths.patch new file mode 100644 index 0000000000000..9b342f5bd08b6 --- /dev/null +++ b/pkgs/tools/networking/network-manager/openconnect/fix-paths.patch @@ -0,0 +1,20 @@ +--- a/src/nm-openconnect-service.c ++++ b/src/nm-openconnect-service.c +@@ -60,7 +60,7 @@ + + static const char *openconnect_binary_paths[] = + { +- "/usr/bin/openconnect", ++ "@openconnect@/bin/openconnect", + "/usr/sbin/openconnect", + "/usr/local/bin/openconnect", + "/usr/local/sbin/openconnect", +@@ -734,7 +734,7 @@ + + _LOGD ("nm-openconnect-service (version " DIST_VERSION ") starting..."); + +- if (system ("/sbin/modprobe tun") == -1) ++ if (system ("@kmod@/bin/modprobe tun") == -1) + exit (EXIT_FAILURE); + + if (bus_name) diff --git a/pkgs/tools/networking/network-manager/openvpn/default.nix b/pkgs/tools/networking/network-manager/openvpn/default.nix index 28b7c873d364a..8d3bd874718c4 100644 --- a/pkgs/tools/networking/network-manager/openvpn/default.nix +++ b/pkgs/tools/networking/network-manager/openvpn/default.nix @@ -2,13 +2,13 @@ , withGnome ? true, gnome3, kmod }: let - pname = "NetworkManager-openvpn"; + pname = "NetworkManager-openvpn"; version = "1.8.4"; in stdenv.mkDerivation rec { - name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0gyrv46h9k17qym48qacq4zpxbap6hi17shn921824zm98m2bdvr"; }; @@ -19,15 +19,13 @@ in stdenv.mkDerivation rec { }) ]; - buildInputs = [ openvpn networkmanager libsecret ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring - gnome3.networkmanagerapplet ]; + buildInputs = [ openvpn networkmanager ] + ++ stdenv.lib.optionals withGnome [ gnome3.gtk libsecret gnome3.networkmanagerapplet ]; nativeBuildInputs = [ intltool pkgconfig libxml2 ]; configureFlags = [ - "${if withGnome then "--with-gnome --with-gtkver=3" else "--without-gnome"}" - "--disable-static" + "--with-gnome=${if withGnome then "yes" else "no"}" "--localstatedir=/" # needed for the management socket under /run/NetworkManager ]; @@ -38,8 +36,9 @@ in stdenv.mkDerivation rec { }; }; - meta = { + meta = with stdenv.lib; { description = "NetworkManager's OpenVPN plugin"; inherit (networkmanager.meta) maintainers platforms; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/network-manager/strongswan.nix b/pkgs/tools/networking/network-manager/strongswan.nix index fb3ba2bbdf5a9..fc10fc6364c95 100644 --- a/pkgs/tools/networking/network-manager/strongswan.nix +++ b/pkgs/tools/networking/network-manager/strongswan.nix @@ -1,38 +1,35 @@ -{ stdenv, fetchurl, intltool, pkgconfig, networkmanager, strongswanNM, sysctl -, gnome3, libgnome-keyring, libsecret }: +{ stdenv, fetchurl, intltool, pkgconfig, networkmanager, strongswanNM +, gnome3, libsecret }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; - pname = "NetworkManager-strongswan"; - version = "1.4.3"; + name = "${pname}-${version}"; + pname = "NetworkManager-strongswan"; + version = "1.4.4"; src = fetchurl { - url = "https://download.strongswan.org/NetworkManager/${name}.tar.bz2"; - sha256 = "0jzl52wmh2q2djb1s546kxliy7s6akhi5bx6rp2ppjfk3wbi2a2l"; + url = "https://download.strongswan.org/NetworkManager/${name}.tar.bz2"; + sha256 = "1xhj5cipwbihf0cna8lpicpz7cd8fgkagpmg0xvj6pshymm5jbcd"; }; - postPatch = '' - sed -i "s,nm_plugindir=.*,nm_plugindir=$out/lib/NetworkManager," "configure" - sed -i "s,nm_libexecdir=.*,nm_libexecdir=$out/libexec," "configure" - ''; - buildInputs = [ networkmanager strongswanNM libsecret ] - ++ (with gnome3; [ gtk libgnome-keyring networkmanagerapplet ]); + ++ (with gnome3; [ gtk networkmanagerapplet ]); nativeBuildInputs = [ intltool pkgconfig ]; # Fixes deprecation errors with networkmanager 1.10.2 NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations"; - preConfigure = '' - substituteInPlace "configure" \ - --replace "/sbin/sysctl" "${sysctl}/bin/sysctl" - ''; + configureFlags = [ + "--with-charon=${strongswanNM}/libexec/ipsec/charon-nm" + "--with-nm-libexecdir=$(out)/libexec" + "--with-nm-plugindir=$(out)/lib/NetworkManager" + ]; - configureFlags = [ "--with-charon=${strongswanNM}/libexec/ipsec/charon-nm" ]; + PKG_CONFIG_LIBNM_VPNSERVICEDIR = "$(out)/lib/NetworkManager/VPN"; - meta = { + meta = with stdenv.lib; { description = "NetworkManager's strongswan plugin"; inherit (networkmanager.meta) platforms; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/network-manager/vpnc.nix b/pkgs/tools/networking/network-manager/vpnc.nix deleted file mode 100644 index 577e04f6648de..0000000000000 --- a/pkgs/tools/networking/network-manager/vpnc.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv, fetchurl, vpnc, intltool, pkgconfig, networkmanager, libsecret -, withGnome ? true, gnome3, procps, kmod, file }: -let - pname = "NetworkManager-vpnc"; - version = "1.2.6"; -in stdenv.mkDerivation rec { - name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1js5lwcsqws4klgypfxl4ikmakv7v7xgddij1fj6b0y0qicx0kyy"; - }; - - buildInputs = [ vpnc networkmanager libsecret ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring - gnome3.networkmanagerapplet ]; - - nativeBuildInputs = [ intltool pkgconfig file ]; - - configureFlags = [ - "${if withGnome then "--with-gnome --with-gtkver=3" else "--without-gnome"}" - "--disable-static" - ]; - - preConfigure = '' - substituteInPlace "configure" \ - --replace "/sbin/sysctl" "${procps}/bin/sysctl" - substituteInPlace "src/nm-vpnc-service.c" \ - --replace "/sbin/vpnc" "${vpnc}/bin/vpnc" \ - --replace "/sbin/modprobe" "${kmod}/bin/modprobe" - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "networkmanager-vpnc"; - }; - }; - - meta = { - description = "NetworkManager's VPNC plugin"; - inherit (networkmanager.meta) maintainers platforms; - }; -} - diff --git a/pkgs/tools/networking/network-manager/vpnc/default.nix b/pkgs/tools/networking/network-manager/vpnc/default.nix new file mode 100644 index 0000000000000..d2b3a345d495e --- /dev/null +++ b/pkgs/tools/networking/network-manager/vpnc/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, substituteAll, vpnc, intltool, pkgconfig, networkmanager, libsecret +, withGnome ? true, gnome3, kmod, file }: +let + pname = "NetworkManager-vpnc"; + version = "1.2.6"; +in stdenv.mkDerivation rec { + name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1js5lwcsqws4klgypfxl4ikmakv7v7xgddij1fj6b0y0qicx0kyy"; + }; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + inherit vpnc kmod; + }) + ]; + + buildInputs = [ vpnc networkmanager ] + ++ stdenv.lib.optionals withGnome [ gnome3.gtk libsecret gnome3.networkmanagerapplet ]; + + nativeBuildInputs = [ intltool pkgconfig file ]; + + configureFlags = [ + "--with-gnome=${if withGnome then "yes" else "no"}" + ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "networkmanager-vpnc"; + }; + }; + + meta = with stdenv.lib; { + description = "NetworkManager's VPNC plugin"; + inherit (networkmanager.meta) maintainers platforms; + license = licenses.gpl2Plus; + }; +} diff --git a/pkgs/tools/networking/network-manager/vpnc/fix-paths.patch b/pkgs/tools/networking/network-manager/vpnc/fix-paths.patch new file mode 100644 index 0000000000000..98238ac01f76d --- /dev/null +++ b/pkgs/tools/networking/network-manager/vpnc/fix-paths.patch @@ -0,0 +1,31 @@ +--- a/properties/nm-vpnc-editor-plugin.c ++++ b/properties/nm-vpnc-editor-plugin.c +@@ -161,7 +161,7 @@ + GError *error = NULL; + + const char *decrypt_possible_paths[] = { +- "/usr/lib/vpnc/cisco-decrypt", ++ "@vpnc@/bin/cisco-decrypt", + "/usr/bin/cisco-decrypt", + NULL + }; +--- a/src/nm-vpnc-service.c ++++ b/src/nm-vpnc-service.c +@@ -610,7 +610,7 @@ + find_vpnc (void) + { + static const char *vpnc_paths[] = { +- "/usr/sbin/vpnc", ++ "@vpnc@/bin/vpnc", + "/sbin/vpnc", + "/usr/local/sbin/vpnc", + NULL +@@ -1308,7 +1308,7 @@ + _LOGD (" vpnc interactive mode is %s", interactive_available ? "enabled" : "disabled"); + _LOGD (" uses%s --bus-name \"%s\"", bus_name_free ? "" : " default", bus_name); + +- if (system ("/sbin/modprobe tun") == -1) ++ if (system ("@kmod@/bin/modprobe tun") == -1) + exit (EXIT_FAILURE); + + plugin = nm_vpnc_plugin_new (bus_name); diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rtorrent/default.nix index 658739c93aa02..63652557efa50 100644 --- a/pkgs/tools/networking/p2p/rtorrent/default.nix +++ b/pkgs/tools/networking/p2p/rtorrent/default.nix @@ -47,5 +47,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ ebzzry codyopel ]; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/siege/default.nix b/pkgs/tools/networking/siege/default.nix index cac3e3e6361f7..a0a6599741487 100644 --- a/pkgs/tools/networking/siege/default.nix +++ b/pkgs/tools/networking/siege/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "HTTP load tester"; maintainers = with maintainers; [ ocharles raskin ]; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/sshpass/default.nix b/pkgs/tools/networking/sshpass/default.nix index aedb89ce48919..94221a359c1d8 100644 --- a/pkgs/tools/networking/sshpass/default.nix +++ b/pkgs/tools/networking/sshpass/default.nix @@ -9,10 +9,11 @@ stdenv.mkDerivation rec { sha256 = "0q7fblaczb7kwbsz0gdy9267z0sllzgmf0c7z5c9mf88wv74ycn6"; }; - meta = { + meta = with stdenv.lib; { homepage = https://sourceforge.net/projects/sshpass/; description = "Non-interactive ssh password auth"; - maintainers = [ stdenv.lib.maintainers.madjar ]; - platforms = stdenv.lib.platforms.unix; + license = licenses.gpl2; + maintainers = [ maintainers.madjar ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/ssmtp/default.nix b/pkgs/tools/networking/ssmtp/default.nix index 6a8306cc4b8d9..24e96491f9d85 100644 --- a/pkgs/tools/networking/ssmtp/default.nix +++ b/pkgs/tools/networking/ssmtp/default.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { platforms = platforms.linux; + license = licenses.gpl2; maintainers = with maintainers; [ basvandijk ]; }; } diff --git a/pkgs/tools/networking/sstp/default.nix b/pkgs/tools/networking/sstp/default.nix index dce6d1acb776b..e8db3a071843b 100644 --- a/pkgs/tools/networking/sstp/default.nix +++ b/pkgs/tools/networking/sstp/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { homepage = http://sstp-client.sourceforge.net/; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.ktosiek ]; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/networking/surfraw/default.nix b/pkgs/tools/networking/surfraw/default.nix index b23616c57e921..80daf6447efa2 100644 --- a/pkgs/tools/networking/surfraw/default.nix +++ b/pkgs/tools/networking/surfraw/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { homepage = http://surfraw.alioth.debian.org; maintainers = []; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.publicDomain; }; } diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index 20830cf3613f9..0bd99c6359611 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (libpsl != null) libpsl ++ stdenv.lib.optional stdenv.isDarwin perl; - configureFlags = [ + configureFlags = [ (stdenv.lib.withFeatureAs (openssl != null) "ssl" "openssl") ]; diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index 3604d011dec50..7a58ec04e64dc 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, dysnomia, disnix, socat, pkgconfig, getopt }: stdenv.mkDerivation { - name = "disnixos-0.7"; + name = "disnixos-0.7.1"; src = fetchurl { - url = https://github.com/svanderburg/disnixos/files/1756702/disnixos-0.7.tar.gz; - sha256 = "1qf9h3q1r27vg1ry55lj01knq6i0c213f6vlg7wj958mml7fk37b"; + url = https://github.com/svanderburg/disnixos/files/2281312/disnixos-0.7.1.tar.gz; + sha256 = "00d7mcj77lwbj67vnh81bw6k6pg2asimky4zkq32mh8dslnhpnz6"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/package-management/nix-repl/default.nix b/pkgs/tools/package-management/nix-repl/default.nix deleted file mode 100644 index 9fe6ec6e291b7..0000000000000 --- a/pkgs/tools/package-management/nix-repl/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, nix, readline }: - -let rev = "a1ea85e92b067a0a42354a28355c633eac7be65c"; in - -stdenv.mkDerivation { - name = "nix-repl-${lib.getVersion nix}-2016-02-28"; - - src = fetchFromGitHub { - owner = "edolstra"; - repo = "nix-repl"; - inherit rev; - sha256 = "0rf9711day64lgg6g6yqc5709x4sgj137zpqyn019k764i7m2xs8"; - }; - - buildInputs = [ nix readline ]; - - dontBuild = true; - - # FIXME: unfortunate cut&paste. - installPhase = '' - mkdir -p $out/bin - $CXX -O3 -Wall -std=c++0x \ - -o $out/bin/nix-repl nix-repl.cc \ - -I${nix.dev}/include/nix \ - -lnixformat -lnixutil -lnixstore -lnixexpr -lnixmain -lreadline -lgc \ - -DNIX_VERSION=\"${(builtins.parseDrvName nix.name).version}\" - ''; - - meta = { - homepage = https://github.com/edolstra/nix-repl; - description = "An interactive environment for evaluating and building Nix expressions"; - maintainers = [ lib.maintainers.eelco ]; - license = lib.licenses.gpl3; - platforms = nix.meta.platforms; - }; -} diff --git a/pkgs/tools/package-management/nixops/generic.nix b/pkgs/tools/package-management/nixops/generic.nix index 105cb6d7ab0fc..31adac4436c87 100644 --- a/pkgs/tools/package-management/nixops/generic.nix +++ b/pkgs/tools/package-management/nixops/generic.nix @@ -47,5 +47,6 @@ python2Packages.buildPythonApplication { description = "NixOS cloud provisioning and deployment tool"; maintainers = with lib.maintainers; [ eelco rob domenkozar ]; platforms = lib.platforms.unix; + license = lib.licenses.lgpl3; }; } diff --git a/pkgs/tools/security/aws-okta/default.nix b/pkgs/tools/security/aws-okta/default.nix new file mode 100644 index 0000000000000..7ec5b024de133 --- /dev/null +++ b/pkgs/tools/security/aws-okta/default.nix @@ -0,0 +1,26 @@ +{ buildGoPackage, fetchFromGitHub, stdenv }: +buildGoPackage rec { + name = "aws-okta-${version}"; + version = "0.19.0"; + + goPackagePath = "github.com/segmentio/aws-okta"; + + src = fetchFromGitHub { + owner = "segmentio"; + repo = "aws-okta"; + rev = "v${version}"; + sha256 = "1c9mn492yva7cdsx2b0n8g2fdl9660v3xma0v82jzb0c9y9rq0ms"; + }; + + buildFlags = "--tags release"; + + meta = with stdenv.lib; { + inherit version; + description = "aws-vault like tool for Okta authentication"; + license = licenses.mit; + maintainers = [maintainers.imalsogreg]; + platforms = platforms.all; + homepage = https://github.com/segmentio/aws-okta; + downloadPage = "https://github.com/segmentio/aws-okta"; + }; +} diff --git a/pkgs/tools/security/dirmngr/default.nix b/pkgs/tools/security/dirmngr/default.nix index 888fa48eab9ad..ee97bda190644 100644 --- a/pkgs/tools/security/dirmngr/default.nix +++ b/pkgs/tools/security/dirmngr/default.nix @@ -12,5 +12,6 @@ stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/security/fwknop/default.nix b/pkgs/tools/security/fwknop/default.nix index a8fc864afd63c..812c032230c1a 100644 --- a/pkgs/tools/security/fwknop/default.nix +++ b/pkgs/tools/security/fwknop/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { "--with-iptables=${iptables}/sbin/iptables" (stdenv.lib.enableFeature buildServer "server") (stdenv.lib.enableFeature buildClient "client") - (stdenv.lib.withFeatureAs wgetSupport wget "${wget}/bin/wget") + (stdenv.lib.withFeatureAs wgetSupport "wget" "${wget}/bin/wget") ] ++ stdenv.lib.optionalString gnupgSupport [ "--with-gpgme" "--with-gpgme-prefix=${gpgme.dev}" diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index e7a3d2e0759b7..1f0126005f8f7 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -29,12 +29,12 @@ let }; generic = extensionsEnv: extraPassthru: stdenv.mkDerivation rec { - version = "1.7.2"; + version = "1.7.3"; name = "password-store-${version}"; src = fetchurl { url = "https://git.zx2c4.com/password-store/snapshot/${name}.tar.xz"; - sha256 = "1sl0d7nc85c6c2bmmmyb8rpmn47vhkj831l153mjlkawjvhwas27"; + sha256 = "1x53k5dn3cdmvy8m4fqdld4hji5n676ksl0ql4armkmsds26av1b"; }; patches = [ ./set-correct-program-name-for-sleep.patch diff --git a/pkgs/tools/security/pass/set-correct-program-name-for-sleep.patch b/pkgs/tools/security/pass/set-correct-program-name-for-sleep.patch index 782e06e20fd92..f3a844ad2d6d3 100644 --- a/pkgs/tools/security/pass/set-correct-program-name-for-sleep.patch +++ b/pkgs/tools/security/pass/set-correct-program-name-for-sleep.patch @@ -1,6 +1,6 @@ -From 25b44e00ed5df8ffe2782d38ad5cd9f514379599 Mon Sep 17 00:00:00 2001 -From: "Andrew R. M" <andrewmiller237@gmail.com> -Date: Sat, 8 Apr 2017 13:50:01 -0400 +From d11261c2ad184daf6e9edd777bc8a3372c277b4b Mon Sep 17 00:00:00 2001 +From: Johannes Frankenau <johannes@frankenau.net> +Date: Fri, 10 Aug 2018 09:49:57 +0200 Subject: [PATCH] Patch the clip() function to work even when using single-binary coreutils @@ -11,7 +11,7 @@ Subject: [PATCH] Patch the clip() function to work even when using 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/password-store.sh b/src/password-store.sh -index 6a4172d..4dbd6b8 100755 +index 7264ffc..68551a4 100755 --- a/src/password-store.sh +++ b/src/password-store.sh @@ -155,11 +155,11 @@ clip() { @@ -20,16 +20,16 @@ index 6a4172d..4dbd6b8 100755 local sleep_argv0="password store sleep on display $DISPLAY" - pkill -f "^$sleep_argv0" 2>/dev/null && sleep 0.5 + pkill -P $(pgrep -f "^$sleep_argv0") 2>/dev/null && sleep 0.5 - local before="$(xclip -o -selection "$X_SELECTION" 2>/dev/null | base64)" + local before="$(xclip -o -selection "$X_SELECTION" 2>/dev/null | $BASE64)" echo -n "$1" | xclip -selection "$X_SELECTION" || die "Error: Could not copy data to the clipboard" ( - ( exec -a "$sleep_argv0" bash <<<"trap 'kill %1' TERM; sleep '$CLIP_TIME' & wait" ) + ( exec -a "$sleep_argv0" bash <(echo trap 'kill %1' TERM\; sleep "$CLIP_TIME & wait") ) - local now="$(xclip -o -selection "$X_SELECTION" | base64)" - [[ $now != $(echo -n "$1" | base64) ]] && before="$now" + local now="$(xclip -o -selection "$X_SELECTION" | $BASE64)" + [[ $now != $(echo -n "$1" | $BASE64) ]] && before="$now" diff --git a/src/platform/cygwin.sh b/src/platform/cygwin.sh -index 6e5dd86..f3574c4 100644 +index 5a8d5ea..423e0ce 100644 --- a/src/platform/cygwin.sh +++ b/src/platform/cygwin.sh @@ -3,11 +3,11 @@ @@ -38,16 +38,16 @@ index 6e5dd86..f3574c4 100644 local sleep_argv0="password store sleep on display $DISPLAY" - pkill -f "^$sleep_argv0" 2>/dev/null && sleep 0.5 + pkill -P $(pgrep -f "^$sleep_argv0") 2>/dev/null && sleep 0.5 - local before="$(base64 < /dev/clipboard)" + local before="$($BASE64 < /dev/clipboard)" echo -n "$1" > /dev/clipboard ( - ( exec -a "$sleep_argv0" sleep "$CLIP_TIME" ) + ( exec -a "$sleep_argv0" bash <(echo sleep "$CLIP_TIME") ) - local now="$(base64 < /dev/clipboard)" - [[ $now != $(echo -n "$1" | base64) ]] && before="$now" - echo "$before" | base64 -d > /dev/clipboard + local now="$($BASE64 < /dev/clipboard)" + [[ $now != $(echo -n "$1" | $BASE64) ]] && before="$now" + echo "$before" | $BASE64 -d > /dev/clipboard diff --git a/src/platform/darwin.sh b/src/platform/darwin.sh -index 86eb325..deb04c4 100644 +index 342ecce..9e12837 100644 --- a/src/platform/darwin.sh +++ b/src/platform/darwin.sh @@ -3,11 +3,11 @@ @@ -56,14 +56,14 @@ index 86eb325..deb04c4 100644 local sleep_argv0="password store sleep for user $(id -u)" - pkill -f "^$sleep_argv0" 2>/dev/null && sleep 0.5 + pkill -P $(pgrep -f "^$sleep_argv0") 2>/dev/null && sleep 0.5 - local before="$(pbpaste | openssl base64)" + local before="$(pbpaste | $BASE64)" echo -n "$1" | pbcopy ( - ( exec -a "$sleep_argv0" sleep "$CLIP_TIME" ) + ( exec -a "$sleep_argv0" bash <(echo sleep "$CLIP_TIME") ) - local now="$(pbpaste | openssl base64)" - [[ $now != $(echo -n "$1" | openssl base64) ]] && before="$now" - echo "$before" | openssl base64 -d | pbcopy + local now="$(pbpaste | $BASE64)" + [[ $now != $(echo -n "$1" | $BASE64) ]] && before="$now" + echo "$before" | $BASE64 -d | pbcopy -- -2.12.2 +2.16.4 diff --git a/pkgs/tools/security/qdigidoc/certs.patch b/pkgs/tools/security/qdigidoc/certs.patch deleted file mode 100644 index 5e28943f333ea..0000000000000 --- a/pkgs/tools/security/qdigidoc/certs.patch +++ /dev/null @@ -1,3309 +0,0 @@ -diff -ruN a/client/CMakeLists.txt b/client/CMakeLists.txt ---- a/client/CMakeLists.txt 2016-01-29 13:06:27.000000000 +0300 -+++ b/client/CMakeLists.txt 2016-04-27 10:17:06.596682326 +0300 -@@ -1,14 +1,5 @@ - set_app_name( PROGNAME qdigidocclient ) - --add_executable( TSLDownload TSLDownload.cpp ) --target_link_libraries( TSLDownload Qt5::Network ) --add_custom_command( -- OUTPUT TSL.qrc tl-mp.xml EE.xml -- DEPENDS TSLDownload -- COMMAND $<TARGET_FILE:TSLDownload> "${CMAKE_CURRENT_BINARY_DIR}" EE -- WORKING_DIRECTORY ${_qt5Core_install_prefix}/bin --) -- - add_definitions( -DPKCS11_MODULE="${PKCS11_MODULE}" ) - include_directories( ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/common ${OPENSSL_INCLUDE_DIR} ) - -@@ -20,7 +11,7 @@ - ) - - configure_file( translations/tr.qrc tr.qrc COPYONLY ) --set( RC_FILES images/images.qrc ${CMAKE_CURRENT_BINARY_DIR}/tr.qrc ${CMAKE_CURRENT_BINARY_DIR}/TSL.qrc ) -+set( RC_FILES images/images.qrc ${CMAKE_CURRENT_BINARY_DIR}/tr.qrc TSL.qrc ) - set( TS_FILES translations/en.ts translations/et.ts translations/ru.ts ) - - if( NOT Qt5Widgets_FOUND ) -diff -ruN a/client/EE.xml b/client/EE.xml ---- a/client/EE.xml 1970-01-01 03:00:00.000000000 +0300 -+++ b/client/EE.xml 2016-04-27 10:17:37.325923576 +0300 -@@ -0,0 +1,1268 @@ -+<?xml version="1.0" encoding="UTF-8"?><TrustServiceStatusList xmlns="http://uri.etsi.org/02231/v2#" xmlns:ns2="http://www.w3.org/2000/09/xmldsig#" xmlns:ns3="http://uri.etsi.org/02231/v2/additionaltypes#" xmlns:ns4="http://uri.etsi.org/01903/v1.3.2#" xmlns:ns5="http://uri.etsi.org/TrstSvc/SvcInfoExt/eSigDir-1999-93-EC-TrustedList/#" Id="EE0001" TSLTag="http://uri.etsi.org/19612/TSLTag"> -+ <SchemeInformation> -+ <TSLVersionIdentifier>4</TSLVersionIdentifier> -+ <TSLSequenceNumber>28</TSLSequenceNumber> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Estonian Technical Surveillance Authority</Name> -+ <Name xml:lang="et">Tehnilise Järelevalve Amet</Name> -+ </SchemeOperatorName> -+ <SchemeOperatorAddress> -+ <PostalAddresses> -+ <PostalAddress xml:lang="en"> -+ <StreetAddress>23A Sõle St</StreetAddress> -+ <Locality>Tallinn</Locality> -+ <PostalCode>10614</PostalCode> -+ <CountryName>EE</CountryName> -+ </PostalAddress> -+ </PostalAddresses> -+ <ElectronicAddress> -+ <URI xml:lang="en">mailto:info@tja.ee</URI> -+ <URI xml:lang="en">http://sr.riik.ee/en.html</URI> -+ </ElectronicAddress> -+ </SchemeOperatorAddress> -+ <SchemeName> -+ <Name xml:lang="en">EE:Supervision/Accreditation Status List of certification services from Certification Service Providers, which are supervised/accredited by the referenced Scheme Operator’s Member State for compliance with the relevant provisions laid down in Directive 1999/93/EC of the European Parliament and of the Council of 13 December 1999 on a Community framework for electronic signatures.</Name> -+ </SchemeName> -+ <SchemeInformationURI> -+ <URI xml:lang="en">http://eur-lex.europa.eu/LexUriServ/LexUriServ.do?uri=OJ:L:2013:306:0021:0039:EN:PDF</URI> -+ <URI xml:lang="en">http://sr.riik.ee/en/tsl/estonia.html</URI> -+ <URI xml:lang="et">http://eur-lex.europa.eu/LexUriServ/LexUriServ.do?uri=OJ:L:2013:306:0021:0039:ET:PDF</URI> -+ <URI xml:lang="et">http://sr.riik.ee/et/tsl/eesti.html</URI> -+ </SchemeInformationURI> -+ <StatusDeterminationApproach>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/StatusDetn/EUappropriate</StatusDeterminationApproach> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EE</URI> -+ </SchemeTypeCommunityRules> -+ <SchemeTerritory>EE</SchemeTerritory> -+ <PolicyOrLegalNotice> -+ <TSLLegalNotice xml:lang="en">The applicable legal framework for the present TSL implementation of the Trusted List of supervised/accredited Certification Service Providers for Estonia is Directive 1999/93/EC of the European Parliament and of the Council of 13 December 1999 on a Community framework for electronic signatures and its implementation in Estonia laws.</TSLLegalNotice> -+ <TSLLegalNotice xml:lang="et">Käesolevale Eesti järelvalvealuste/akrediteeritud sertifitseerimisteenuse osutajate usaldusnimekirjale kohaldatava õigusliku raamistiku moodustavad Euroopa Parlamendi ja Nõukogu direktiiv 199/93/EÜ, 13. detsember 1999, digitaalallkirju käsitleva ühenduse raamistiku kohta ning sellele direktiivile vastavad Eesti õigusaktid.</TSLLegalNotice> -+ </PolicyOrLegalNotice> -+ <HistoricalInformationPeriod>65535</HistoricalInformationPeriod> -+ <PointersToOtherTSL> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIFKzCCBBOgAwIBAgISESFCgSJf+NfOVIYHRWWewAm0MA0GCSqGSIb3DQEBCwUAMGYxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTwwOgYDVQQDEzNHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIC0gU0hBMjU2IC0gRzIwHhcNMTUwMzAzMDg1MTAyWhcNMTgwNDIwMTAwNTA1WjBnMQswCQYDVQQGEwJCRTEQMA4GA1UECBMHQmVsZ2l1bTERMA8GA1UEBxMIQnJ1c3NlbHMxHDAaBgNVBAoTE0V1cm9wZWFuIENvbW1pc3Npb24xFTATBgNVBAMTDGVjLmV1cm9wYS5ldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMFBF1FjO2VA4nIvT3MtXToyfWMNFYRvJc2SIJF3pcZNZcUK9wwNL3j/lOB5+eABCTDShJf8fQgmyEcAU7gXhFw9DFgfnXsmmA1a79zzbs5KWzkmAwEE4lfSYcbJoCuUavD79oaR4v3yv7GZMVab8nXuqWvecwzQWT6sl+rx0ogh1bbeKO9wQ5lbEgRw1MLlyFH2kUieMhjCwO2nQJ9UMTaLu7px4LpZ7tlaVetY7UpMPiGAD34kct1YIoJWJllYbbz7jmALmRAdLvvu5y6Ice4H4j0kDJ/l3zLiVeCiORqrx8ngiiS1LfNSckvz2sbzjVJvXbqxYAEytZQvwxEXdPMCAwEAAaOCAdAwggHMMA4GA1UdDwEB/wQEAwIFoDBJBgNVHSAEQjBAMD4GBmeBDAECAjA0MDIGCCsGAQUFBwIBFiZodHRwczovL3d3dy5nbG9iYWxzaWduLmNvbS9yZXBvc2l0b3J5LzAXBgNVHREEEDAOggxlYy5ldXJvcGEuZXUwCQYDVR0TBAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwSQYDVR0fBEIwQDA+oDygOoY4aHR0cDovL2NybC5nbG9iYWxzaWduLmNvbS9ncy9nc29yZ2FuaXphdGlvbnZhbHNoYTJnMi5jcmwwgaAGCCsGAQUFBwEBBIGTMIGQME0GCCsGAQUFBzAChkFodHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24uY29tL2NhY2VydC9nc29yZ2FuaXphdGlvbnZhbHNoYTJnMnIxLmNydDA/BggrBgEFBQcwAYYzaHR0cDovL29jc3AyLmdsb2JhbHNpZ24uY29tL2dzb3JnYW5pemF0aW9udmFsc2hhMmcyMB0GA1UdDgQWBBQ9lw0pOEotT5cKTF8vxu3W6ZCUhzAfBgNVHSMEGDAWgBSW3mHxvRwWKVMcwMx9O4MAQOYafDANBgkqhkiG9w0BAQsFAAOCAQEArSonov8KbE8+5VwewgBHhILHANLIiRmLVJ1siaRXVXL6abmMo8CjW2+VtzAQdnDkzUY6CNATs0y0qkbEcS7fvtvp8QqAiv71+jij6iDT9r9IJ1suNDeQWz6Mng98ecMVsDUzLYieeZXH049tA3hrAnscVRTu7kpT06CGbcJnoNdG7yvxx2Bs9ciVBExrqKMppVHwup23hw/IphHmifPRmXPQ3Fa5FKrqnWJw1BRBLGLOqC1mkj7JuVX108KHlwa5cGiohctnOH9dfyuQPWQecbrobwDgHl4O0Ra+bU/Z4J85YPOB/+F7rOQxRFCpv43zPdg65pNoPppjFDE4TD2bhg==</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl-hr.pdf</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUlistofthelists</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">European Commission</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUlistofthelists</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>EU</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/pdf</ns3:MimeType> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl-mp.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUlistofthelists</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">European Commission</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUlistofthelists</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>EU</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ </PointersToOtherTSL> -+ <ListIssueDateTime>2016-01-13T11:00:00Z</ListIssueDateTime> -+ <NextUpdate> -+ <dateTime>2016-06-10T10:00:00Z</dateTime> -+ </NextUpdate> -+ <DistributionPoints> -+ <URI>http://sr.riik.ee/tsl/estonian-tsl.xml</URI> -+ </DistributionPoints> -+ </SchemeInformation> -+ <TrustServiceProviderList> -+ <TrustServiceProvider> -+ <TSPInformation> -+ <TSPName> -+ <Name xml:lang="en">AS Sertifitseerimiskeskus</Name> -+ </TSPName> -+ <TSPTradeName> -+ <Name xml:lang="en">VATEE-100687640</Name> -+ <Name xml:lang="en">AS Sertifitseerimiskeskus</Name> -+ <Name xml:lang="en">ESTEID</Name> -+ <Name xml:lang="en">SK</Name> -+ </TSPTradeName> -+ <TSPAddress> -+ <PostalAddresses> -+ <PostalAddress xml:lang="en"> -+ <StreetAddress>Pärnu mnt 141</StreetAddress> -+ <Locality>Tallinn</Locality> -+ <PostalCode>11314</PostalCode> -+ <CountryName>EE</CountryName> -+ </PostalAddress> -+ </PostalAddresses> -+ <ElectronicAddress> -+ <URI xml:lang="en">mailto:info@sk.ee</URI> -+ <URI xml:lang="en">http://www.sk.ee/en</URI> -+ </ElectronicAddress> -+ </TSPAddress> -+ <TSPInformationURI> -+ <URI xml:lang="en">http://www.sk.ee/en/repository/CPS</URI> -+ <URI xml:lang="en">http://sr.riik.ee/en/registry/legal-framework.html</URI> -+ <URI xml:lang="et">http://www.sk.ee/repositoorium/CPS</URI> -+ <URI xml:lang="et">http://sr.riik.ee/et/register/oigusaktid.html</URI> -+ </TSPInformationURI> -+ </TSPInformation> -+ <TSPServices> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/CA/QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">ESTEID-SK: Qualified certificates for Estonian ID-card</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIFAjCCA+qgAwIBAgIEPERcgjANBgkqhkiG9w0BAQUFADBdMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMRAwDgYDVQQDEwdKdXVyLVNLMB4XDTAyMDExNTE2NDQ1MFoXDTEyMDExMzE2NDQ1MFowfDEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEPMA0GA1UECxMGRVNURUlEMQowCAYDVQQEEwExMRIwEAYDVQQDEwlFU1RFSUQtU0swggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCLeZO5NVo3zbwA8eFVCrrbeZQKvPDB7LUDPvzCqw7U2sC+IwEOdjjpJRF4lxFs+f8yC1bP+rqtWzrKhhJ2owfSAlIZMbly/OFjfLqOcyyi7qdfA/66u+69u/DY9tW5fqW93D73v5WNcNoIemCTydh9IFkQvMihWKH7LblBzCHa4W6qUcBZ7QsBgYpQS9n9fGJt5D2wCDeq0pF1Zy72G3CQFrpuR/aPG28tv9r+C7oqncapbiJ7xIOa77Fm3o07M/9aarq/m1oHEp9CxYiH9nmD3kyMe8yxw5v02MTMmAcxOm83z5O4oXSDTALG5gDfZNPjJaNPno7J8FuGrI3vV8z3AgMBAAGjggGpMIIBpTAMBgNVHRMEBTADAQH/MA4GA1UdDwEB/wQEAwIB5jCCARYGA1UdIASCAQ0wggEJMIIBBQYKKwYBBAHOHwEBATCB9jCB0AYIKwYBBQUHAgIwgcMegcAAUwBlAGUAIABzAGUAcgB0AGkAZgBpAGsAYQBhAHQAIABvAG4AIAB2AOQAbABqAGEAcwB0AGEAdAB1AGQAIABBAFMALQBpAHMAIABTAGUAcgB0AGkAZgBpAHQAcwBlAGUAcgBpAG0AaQBzAGsAZQBzAGsAdQBzACAAYQBsAGEAbQAtAFMASwAgAHMAZQByAHQAaQBmAGkAawBhAGEAdABpAGQAZQAgAGsAaQBuAG4AaQB0AGEAbQBpAHMAZQBrAHMwIQYIKwYBBQUHAgEWFWh0dHA6Ly93d3cuc2suZWUvY3BzLzArBgNVHR8EJDAiMCCgHqAchhpodHRwOi8vd3d3LnNrLmVlL2p1dXIvY3JsLzAfBgNVHSMEGDAWgBQEqnpHo+SJrxrPCkCnGD9v7+l9vjAdBgNVHQ4EFgQUeBe1BfmzWM1ZjN5nXkQGTHWGaV0wDQYJKoZIhvcNAQEFBQADggEBAFIsMHaq4Ffkrxmzw38rHYh5Ia5JGxjtWfPpag9pBtQNZHzY8j97xfPI15haE9Ah3u1WC+bsU2SndVSUGaZ0gKafMxDOy2DUw3B84ymbNRiAFSWty+aKrMCjtdlPktbSQmxNSJAX9vVtM4Y2ory+dtAQ7g11GKHJ+l8BDUpOJA+l8hvS2l4K5whWDHCSqlplMiHPIKgBVArFRNzAq6dquMY+kS3e2PL+PM4GdDW5lRHR/6KUy0BHP2gX/BO4mYQ3BH2BHImUclNras0HISnV/pt6hIkgd1PsFt3rtEolAWP4DWBmc4zAYQJ5t0cEwFM329zCXSGIQIm3a1cMugF5Q/k=</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>CN=ESTEID-SK, SURNAME=1, OU=ESTEID, O=AS Sertifitseerimiskeskus, C=EE, EMAILADDRESS=pki@sk.ee</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2002-01-15T17:44:50Z</StatusStartingTime> -+ <TSPServiceDefinitionURI> -+ <URI xml:lang="en">https://sk.ee/en/repository/CP/</URI> -+ <URI xml:lang="et">https://sk.ee/repositoorium/CP/</URI> -+ </TSPServiceDefinitionURI> -+ <ServiceInformationExtensions> -+ <Extension Critical="true"> -+ <ns5:Qualifications> -+ <ns5:QualificationElement> -+ <ns5:Qualifiers> -+ <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCWithSSCD"/> -+ </ns5:Qualifiers> -+ <ns5:CriteriaList assert="atLeastOne"> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="digitalSignature">true</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:Description> This service issues qualified certificates for e-signing and e-authentication within the same process. The Relying Party shall make distinction by inspection of keyUsage field contents - e-signature certificates have nonRepudation bit set exclusively. Any certificate issued under the CA/QC Sdi certificate and is issued as a QC (i.e. containing a QcCompliance statement) and that has either its nR or its dS bit set is to be considered as supported by an SSCD</ns5:Description> -+ </ns5:CriteriaList> -+ </ns5:QualificationElement> -+ <ns5:QualificationElement> -+ <ns5:Qualifiers> -+ <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCStatement"/> -+ </ns5:Qualifiers> -+ <ns5:CriteriaList assert="all"> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:Description>All certificates issued under this CA/QC service that have nonRepudiation bit set exclusively are issued as qualified certificates</ns5:Description> -+ </ns5:CriteriaList> -+ </ns5:QualificationElement> -+ </ns5:Qualifications> -+ </Extension> -+ </ServiceInformationExtensions> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/CA/QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">ESTEID-SK 2007: Qualified certificates for Estonian ID-card, the residence permit card, the digital identity card, the digital identity card in form of the Mobile-ID</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIID0zCCArugAwIBAgIERZugDTANBgkqhkiG9w0BAQUFADBdMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMRAwDgYDVQQDEwdKdXVyLVNLMB4XDTA3MDEwMzEyMjIzN1oXDTE2MDgyNjE0MjMwMVowWzELMAkGA1UEBhMCRUUxIjAgBgNVBAoTGUFTIFNlcnRpZml0c2VlcmltaXNrZXNrdXMxDzANBgNVBAsTBkVTVEVJRDEXMBUGA1UEAxMORVNURUlELVNLIDIwMDcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDtWp2jLCsA7K9AxoPDOL0geM1GoR0Q6wSUICCJYyFkUMboEMxpSzFB6tlb0ySlHEU6Fs+tjA4QrSqwaw0uNk4BXv1lkoOr6DUc+20+AQd5jB6A0atrltZ1XG5IvDEep3DJPykkk2MPxUz7dZx7XUEr/kdUWI9cDIkFWic7y9oTBY9JaV6lxm08kweZ/qTw5PU8/bTvZCE0ygvBXU4TDS2FpUJ/+jTzM2ocWa3QjFQv2Sir6LBvgNY3du/m+WLABq0dgN18R4nhFtmaVepqAeUuEi8eRBl6yLTSmMwYCY46LsK5CdjTCZSZv934FtNuyY6Ph9nCXJAgNAY+GfNJfdMXAgMBAAGjgZwwgZkwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAf4wMwYDVR0fBCwwKjAooCagJIYiaHR0cDovL3d3dy5zay5lZS9jcmxzL2p1dXIvY3JsLmNybDAfBgNVHSMEGDAWgBQEqnpHo+SJrxrPCkCnGD9v7+l9vjAdBgNVHQ4EFgQUSAbevoyHV5WAeGP6nCMrK6A6GHUwDQYJKoZIhvcNAQEFBQADggEBACO6SJrjN5WZuiLSMy/tSmT/w3dd/KPErSAdUIJYkC7hOIauW7jZ3VNgNUMHSIkUoP8AviEMjGA4lkT61YScpJAdmgl8Y80HFdZV5CsThhddoIdZ3cZjSI4NZmTVkSduTjoySALxKL3ZEIPrepQDvNEeV1WSpI5+u/vMekUWJSPc8BK9O2av1e9ResKyPJidqrIksHFjNS+Yt8Ouw7F10MHaPPzMiwoa0DYTVsIKJncPTQmvdJG8M0DDToiiNPQuUy5d1CA75Wtjs+yILGZXpOfbdoQhE7G4pbZaF1s69jKp+zc0ZT4g2OoKfI2TiIX9qeGJMxkOENcd1DDqYVfePmo=</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>CN=ESTEID-SK 2007, OU=ESTEID, O=AS Sertifitseerimiskeskus, C=EE</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2007-01-03T13:22:37Z</StatusStartingTime> -+ <TSPServiceDefinitionURI> -+ <URI xml:lang="et">https://sk.ee/repositoorium/CP/</URI> -+ <URI xml:lang="en">https://sk.ee/en/repository/CP/</URI> -+ </TSPServiceDefinitionURI> -+ <ServiceInformationExtensions> -+ <Extension Critical="true"> -+ <ns5:Qualifications> -+ <ns5:QualificationElement> -+ <ns5:Qualifiers> -+ <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCWithSSCD"/> -+ </ns5:Qualifiers> -+ <ns5:CriteriaList assert="atLeastOne"> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="digitalSignature">true</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:Description> This service issues qualified certificates for e-signing and e-authentication within the same process. The Relying Party shall make distinction by inspection of keyUsage field contents - e-signature certificates have nonRepudation bit set exclusively. Any certificate issued under the CA/QC Sdi certificate and is issued as a QC (i.e. containing a QcCompliance statement) and that has either its nR or its dS bit set is to be considered as supported by an SSCD</ns5:Description> -+ </ns5:CriteriaList> -+ </ns5:QualificationElement> -+ <ns5:QualificationElement> -+ <ns5:Qualifiers> -+ <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCStatement"/> -+ </ns5:Qualifiers> -+ <ns5:CriteriaList assert="all"> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:Description>All certificates issued under this CA/QC service that have nonRepudiation bit set exclusively are issued as qualified certificates</ns5:Description> -+ </ns5:CriteriaList> -+ </ns5:QualificationElement> -+ </ns5:Qualifications> -+ </Extension> -+ </ServiceInformationExtensions> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/CA/QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">ESTEID-SK 2011: Qualified certificates for Estonian ID-card, the residence permit card, the digital identity card, the digital identity card in form of the Mobile-ID</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509SubjectName>EMAILADDRESS=pki@sk.ee, CN=ESTEID-SK 2011, O=AS Sertifitseerimiskeskus, C=EE</X509SubjectName> -+ </DigitalId> -+ <DigitalId> -+ <X509Certificate>MIIFBTCCA+2gAwIBAgIQKVKTqv2MxtRNgzCjwmRRDTANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQGEwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEoMCYGA1UEAwwfRUUgQ2VydGlmaWNhdGlvbiBDZW50cmUgUm9vdCBDQTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMB4XDTExMDMxODEwMTQ1OVoXDTI0MDMxODEwMTQ1OVowZDELMAkGA1UEBhMCRUUxIjAgBgNVBAoMGUFTIFNlcnRpZml0c2VlcmltaXNrZXNrdXMxFzAVBgNVBAMMDkVTVEVJRC1TSyAyMDExMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCz6XxsZh6r/aXcNe3kSpNMOqmQoAXUpzzcr4ZSaGZh/7JHIiplvNi6tbW/lK7sAiRsb65KzMWROEauld66ggbDPga6kU97C+AXGu7+DROXstjUOv6VlrHZVAnLmIOkycpWaxjM+EfQPZuDxEbkw96B3/fG69Zbp3s9y6WEhwU5Y9IiQl8YTkGnNUxidQbON1BGQm+HVEsgTf22J6r6G3FsE07rnMNskNC3DjuLSCUKF4kH0rVGVK9BdiCdFaZjHEykjwjIGzqnyxyRKe4YbJ6B9ABm95eSFgMBHtZEYU+q0VUIQGhAGAurOTXjWi1TssA42mnLGQZEI5GXMXtabp51AgMBAAGjggGgMIIBnDASBgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjCB9gYDVR0gBIHuMIHrMIHoBgsrBgEEAc4fZAEBATCB2DCBsgYIKwYBBQUHAgIwgaUegaIASwBhAHMAdQB0AGEAdABhAGsAcwBlACAAaQBzAGkAawB1AHQAdAD1AGUAbgBkAGEAdgBhAGwAZQAgAGQAbwBrAHUAbQBlAG4AZABpAGwAZQAgAGsAYQBuAHQAYQB2AGEAdABlACAAcwBlAHIAdABpAGYAaQBrAGEAYQB0AGkAZABlACAAdgDkAGwAagBhAHMAdABhAG0AaQBzAGUAawBzAC4wIQYIKwYBBQUHAgEWFWh0dHBzOi8vd3d3LnNrLmVlL0NQUzAdBgNVHQ4EFgQUe2ryVVBcuNl6CIdBrvqiKz1bV3YwHwYDVR0jBBgwFoAUEvJaPupWHL/NBqzx8SXJqUvUFJkwPQYDVR0fBDYwNDAyoDCgLoYsaHR0cDovL3d3dy5zay5lZS9yZXBvc2l0b3J5L2NybHMvZWVjY3JjYS5jcmwwDQYJKoZIhvcNAQEFBQADggEBAKC4IN3FC2gVDIH05TNMgFrQOCGSnXhzoJclRLoQ81BCOXTZI4qn7N74FHEnrAy6uNG7SS5qANqSaPIL8dp63jg/L4qn4iWaB5q5GGJOV07SnTHS7gUrqChGClnUeHxiZbL13PkP37Lnc+TKl1SKfgtn5FbH5cqrhvbA/VF3Yzlimu+L7EVohW9HKxZ//z8kDn6ieiPFfZdTOov/0eXVLlxqklybUuS6LYRRDiqQupgBKQBTwNbC8x0UHX00HokW+dCVcQvsUbv4xLhRq/MvyTthE+RdbkrV0JuzbfZvADfj75nA3+ZAzFYS5ZpMOjZ9p4rQVKpzQTklrF0m6mkdcEo=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2011-03-18T11:14:59Z</StatusStartingTime> -+ <TSPServiceDefinitionURI> -+ <URI xml:lang="et">https://sk.ee/repositoorium/CP/</URI> -+ <URI xml:lang="en">https://sk.ee/en/repository/CP/</URI> -+ </TSPServiceDefinitionURI> -+ <ServiceInformationExtensions> -+ <Extension Critical="true"> -+ <ns5:Qualifications> -+ <ns5:QualificationElement> -+ <ns5:Qualifiers> -+ <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCWithSSCD"/> -+ </ns5:Qualifiers> -+ <ns5:CriteriaList assert="atLeastOne"> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="digitalSignature">true</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:Description> This service issues qualified certificates for e-signing and e-authentication within the same process. The Relying Party shall make distinction by inspection of keyUsage field contents - e-signature certificates have nonRepudation bit set exclusively. Any certificate issued under the CA/QC Sdi certificate and is issued as a QC (i.e. containing a QcCompliance statement) and that has either its nR or its dS bit set is to be considered as supported by an SSCD</ns5:Description> -+ </ns5:CriteriaList> -+ </ns5:QualificationElement> -+ <ns5:QualificationElement> -+ <ns5:Qualifiers> -+ <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCStatement"/> -+ </ns5:Qualifiers> -+ <ns5:CriteriaList assert="all"> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:Description>All certificates issued under this CA/QC service that have nonRepudiation bit set exclusively are issued as qualified certificates</ns5:Description> -+ </ns5:CriteriaList> -+ </ns5:QualificationElement> -+ </ns5:Qualifications> -+ </Extension> -+ </ServiceInformationExtensions> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/CA/QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">ESTEID-SK 2015: Qualified certificates for Estonian ID-card, the residence permit card, the digital identity card, the digital identity card in form of the Mobile-ID</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509SubjectName>CN=ESTEID-SK 2015,2.5.4.97=#130e4e545245452d3130373437303133,O=AS Sertifitseerimiskeskus,C=EE</X509SubjectName> -+ </DigitalId> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2015-12-17T12:38:00Z</StatusStartingTime> -+ <TSPServiceDefinitionURI> -+ <URI xml:lang="et">https://sk.ee/repositoorium/CP/</URI> -+ <URI xml:lang="en">https://sk.ee/en/repository/CP/</URI> -+ </TSPServiceDefinitionURI> -+ <ServiceInformationExtensions> -+ <Extension Critical="true"> -+ <ns5:Qualifications> -+ <ns5:QualificationElement> -+ <ns5:Qualifiers> -+ <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCWithSSCD"/> -+ </ns5:Qualifiers> -+ <ns5:CriteriaList assert="atLeastOne"> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="digitalSignature">true</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:Description> This service issues qualified certificates for e-signing and e-authentication within the same process. The Relying Party shall make distinction by inspection of keyUsage field contents - e-signature certificates have nonRepudation bit set exclusively. Any certificate issued under the CA/QC Sdi certificate and is issued as a QC (i.e. containing a QcCompliance statement) and that has either its nR or its dS bit set is to be considered as supported by an SSCD</ns5:Description> -+ </ns5:CriteriaList> -+ </ns5:QualificationElement> -+ <ns5:QualificationElement> -+ <ns5:Qualifiers> -+ <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCStatement"/> -+ </ns5:Qualifiers> -+ <ns5:CriteriaList assert="all"> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:Description>All certificates issued under this CA/QC service that have nonRepudiation bit set exclusively are issued as qualified certificates</ns5:Description> -+ </ns5:CriteriaList> -+ </ns5:QualificationElement> -+ </ns5:Qualifications> -+ </Extension> -+ </ServiceInformationExtensions> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/CA/QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">EID-SK 2007: Qualified certificates for Mobile-ID</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIID4jCCAsqgAwIBAgIERZ4nqjANBgkqhkiG9w0BAQUFADBdMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMRAwDgYDVQQDEwdKdXVyLVNLMB4XDTA3MDEwNTEwMjU0NloXDTE2MDgyNjE0MjMwMVowajELMAkGA1UEBhMCRUUxIjAgBgNVBAoTGUFTIFNlcnRpZml0c2VlcmltaXNrZXNrdXMxITAfBgNVBAsTGFNlcnRpZml0c2VlcmltaXN0ZWVudXNlZDEUMBIGA1UEAxMLRUlELVNLIDIwMDcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDifhEdyvuhk/3TJEGMJ1tEZOskE81yMqPGGXaPHXACJ7fncn1D1uQFt+RG8/ckh7zDquHV1m4HQk7dchaP00rvgsvRlYC9GPcFt6TW8w3t+BkxY1RNbmONgH3qzikljk7m6Nb8UGtL9hOmZdw5k5t9Ht8fgHTnoBkFrxYgsv9d4CCkBTSprNUK+vy/NTak4iAYinWtK6tRHHb1fxRsLUXiDLSO42Kz+rehhslANX+9Y5/h0wlh3pcmxLB1JWAP0O9fV6N1LUQ3Ym7wMp/lBXuPvl52yJuSZDWUF7GkIp+vUifOSefF6CeGh8K9BXDvuOqg+5c/6gkfEQxpRgdu+q5FAgMBAAGjgZwwgZkwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAf4wMwYDVR0fBCwwKjAooCagJIYiaHR0cDovL3d3dy5zay5lZS9jcmxzL2p1dXIvY3JsLmNybDAfBgNVHSMEGDAWgBQEqnpHo+SJrxrPCkCnGD9v7+l9vjAdBgNVHQ4EFgQUHAf0nL+kJWyztJ4iHx+USBtYeo0wDQYJKoZIhvcNAQEFBQADggEBABaiEXv415Oh7AgHODwKRyNFqPcSSOgpLCy1XJB3hl3fi21fslccWuBhfzqHQCiQi0fewh109IJiHq8n1PeKoHBCUVq6NFpxkVsUlUPBr0Qsya1O3SQjuOsBLzUWBvY25dtBuAkBMCo0V1Erf7iTeOzuL4LLbCoeOfeQT3HPmEfSqP5f8V10ST8erbiTVPJwzr66vXaT9YKxy8NyAQc2iaOHuYmGKxs8dgDQRkG6b2a/f5q21YEQKDhvz7VvM6tH+F+rohA2wAvVz4tcPtyw5WEYcavr1KHgz4eZVWsqh2OsHUK9qMas5m/44O1/hXrjpMy5IQsiB4ASXDuXvdOTVbU=</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>CN=EID-SK 2007, OU=Sertifitseerimisteenused, O=AS Sertifitseerimiskeskus, C=EE</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2007-01-05T11:25:46Z</StatusStartingTime> -+ <TSPServiceDefinitionURI> -+ <URI xml:lang="et">https://sk.ee/repositoorium/CP/</URI> -+ <URI xml:lang="en">https://sk.ee/en/repository/CP/</URI> -+ </TSPServiceDefinitionURI> -+ <ServiceInformationExtensions> -+ <Extension Critical="true"> -+ <ns5:Qualifications> -+ <ns5:QualificationElement> -+ <ns5:Qualifiers> -+ <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCWithSSCD"/> -+ </ns5:Qualifiers> -+ <ns5:CriteriaList assert="atLeastOne"> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="digitalSignature">true</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:Description> This service issues qualified certificates for e-signing and e-authentication within the same process. The Relying Party shall make distinction by inspection of keyUsage field contents - e-signature certificates have nonRepudation bit set exclusively. Any certificate issued under the CA/QC Sdi certificate and is issued as a QC (i.e. containing a QcCompliance statement) and that has either its nR or its dS bit set is to be considered as supported by an SSCD</ns5:Description> -+ </ns5:CriteriaList> -+ </ns5:QualificationElement> -+ <ns5:QualificationElement> -+ <ns5:Qualifiers> -+ <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCStatement"/> -+ </ns5:Qualifiers> -+ <ns5:CriteriaList assert="all"> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:Description>All certificates issued under this CA/QC service that have nonRepudiation bit set exclusively are issued as qualified certificates</ns5:Description> -+ </ns5:CriteriaList> -+ </ns5:QualificationElement> -+ </ns5:Qualifications> -+ </Extension> -+ </ServiceInformationExtensions> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/CA/QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">EID-SK 2011: Qualified certificates for Mobile-ID, organisation cards for natural persons</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIFADCCA+igAwIBAgIQQyvUTmJDa0ZNgy+/fS0vWjANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQGEwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEoMCYGA1UEAwwfRUUgQ2VydGlmaWNhdGlvbiBDZW50cmUgUm9vdCBDQTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMB4XDTExMDMxODEwMTExMVoXDTI0MDMxODEwMTExMVowYTELMAkGA1UEBhMCRUUxIjAgBgNVBAoMGUFTIFNlcnRpZml0c2VlcmltaXNrZXNrdXMxFDASBgNVBAMMC0VJRC1TSyAyMDExMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2Q1zKMt7DytbntSLoYAAVkEwV+5djSr0vSIG/Zm9seKyx+2PY8sVzXRoUD1CMIYnstDhBSKMjn2/+HpA7pOipAIAMrk6uKnpSTTdFbQ+0fzJVPokBgsdsQ6R5TZFPB1nu5zgRRlQmWIFxOpDiNHTt0LObUhWLXzUb31vc1Wmao2IYcDx1TCs/1E9+camiCl2B5lXrPEU3wBq4waD54izS20DK05+6+hHRg+TqoIg5YSmwbjStEyd/8AQeokwVloyyH49bnpeluADcZJgxxE9ZUvVWHoxYfmg1IeRU72jHTcIjNf1cQN2+9/FtHQMnGzDBgmAPpghwWr3JtW0JWvMXAgMBAAGjggGeMIIBmjASBgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjCB9AYDVR0gBIHsMIHpMIHmBgsrBgEEAc4fZAEBATCB1jCBsAYIKwYBBQUHAgIwgaMegaAASwBhAHMAdQB0AGEAdABhAGsAcwBlACAAZgD8APwAcwBpAGwAaQBzAHQAZQBsAGUAIABpAHMAaQBrAHUAdABlAGwAZQAgAHMAZQByAHQAaQBmAGkAawBhAGEAdABpAGQAZQAgAHYA5ABsAGoAYQBzAHQAYQBtAGkAcwBlAGsAcwAgAGsAbwBtAG0AZQByAHQAcwBhAGwAdQBzAGUAbAAuMCEGCCsGAQUFBwIBFhVodHRwczovL3d3dy5zay5lZS9DUFMwHQYDVR0OBBYEFLEQlwL63YbGeEGkwzKI+/4f58AFMB8GA1UdIwQYMBaAFBLyWj7qVhy/zQas8fElyalL1BSZMD0GA1UdHwQ2MDQwMqAwoC6GLGh0dHA6Ly93d3cuc2suZWUvcmVwb3NpdG9yeS9jcmxzL2VlY2NyY2EuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQAxau3ohdFkpvaiVUR7arNovQUZRCG9Ge3udqHYemovyU7N60Hgomc/ZG+uunScATTUhBcv9a5zkQxb1dQ1LYDRfNr9CqI0QvSEE4t9Sfu3fOhyLrlmb3s8xhhYLJBJ325uDvtO/qFeXLlcRXMF5nU8FE2IyaZP1CHYKVh5QNPPQiGZGSox5oOkCvmt4lUl4lZUwVie75us/WtrD6DJeREBTEDHORIfg8E9RA1y/7t2gT9vrU8tabeSZlD03qwXe0nJ9RscI/P0HT8vuo1PGzCfbH9xFqfoZ2jdJ0HzxrFM8VsL/AtCw0dmrxRHLlZzqSw0G7b0W40mwOQauO2gbMfn</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>EMAILADDRESS=pki@sk.ee, CN=EID-SK 2011, O=AS Sertifitseerimiskeskus, C=EE</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2011-03-18T11:11:11Z</StatusStartingTime> -+ <TSPServiceDefinitionURI> -+ <URI xml:lang="et">https://sk.ee/repositoorium/CP/</URI> -+ <URI xml:lang="en">https://sk.ee/en/repository/CP/</URI> -+ </TSPServiceDefinitionURI> -+ <ServiceInformationExtensions> -+ <Extension Critical="true"> -+ <ns5:Qualifications> -+ <ns5:QualificationElement> -+ <ns5:Qualifiers> -+ <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCWithSSCD"/> -+ </ns5:Qualifiers> -+ <ns5:CriteriaList assert="atLeastOne"> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="digitalSignature">true</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:Description> This service issues qualified certificates for e-signing and e-authentication within the same process. The Relying Party shall make distinction by inspection of keyUsage field contents - e-signature certificates have nonRepudation bit set exclusively. Any certificate issued under the CA/QC Sdi certificate and is issued as a QC (i.e. containing a QcCompliance statement) and that has either its nR or its dS bit set is to be considered as supported by an SSCD</ns5:Description> -+ </ns5:CriteriaList> -+ </ns5:QualificationElement> -+ <ns5:QualificationElement> -+ <ns5:Qualifiers> -+ <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCStatement"/> -+ </ns5:Qualifiers> -+ <ns5:CriteriaList assert="all"> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:Description>All certificates issued under this CA/QC service that have nonRepudiation bit set exclusively are issued as qualified certificates</ns5:Description> -+ </ns5:CriteriaList> -+ </ns5:QualificationElement> -+ </ns5:Qualifications> -+ </Extension> -+ </ServiceInformationExtensions> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/CA/QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">KLASS3-SK: Qualified electronic seals</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEBDCCAuygAwIBAgIEPNkU9TANBgkqhkiG9w0BAQUFADBdMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMRAwDgYDVQQDEwdKdXVyLVNLMB4XDTAyMDUwODEyMDcxN1oXDTEyMDUwNTExMDcxN1owgY4xGDAWBgkqhkiG9w0BCQEWCXBraUBzay5lZTELMAkGA1UEBhMCRUUxIjAgBgNVBAoTGUFTIFNlcnRpZml0c2VlcmltaXNrZXNrdXMxITAfBgNVBAsTGFNlcnRpZml0c2VlcmltaXN0ZWVudXNlZDEKMAgGA1UEBRMBMTESMBAGA1UEAxMJS0xBU1MzLVNLMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvIIeK3GJxoPCXVwan+HjJwYGaH3nb/rTPEqg5v9e1c7dnTDBdD2Yteg+lUdHBZDHLj1Tz+J/W9Foc0dzEr96S8+6nMXoonK2x0854JNH2UVbS/+YOGUM6iWSxkHw525tvn5tFaIQoaeh46aQFp9Dngcnv4Gatd0/7NCkLggjFrKmnNTPINpLAG9VoCpVyIMvcVCyTNvSQ+n33ToPO5vtULNYOtCF9MDVND+uNRE2o0tWIG0l84owYPA47tJOLgCpAxLNFR5Ys0nB/ofBYcO+YiCri0yc6t7ZPs/vcfbR6czIwW0GMjyHmVPLB+/WHS3P1sk29DdgIC42RTMthJS6ZQIDAQABo4GZMIGWMA8GA1UdEwQIMAYBAf8CAQAwDgYDVR0PAQH/BAQDAgHmMDMGA1UdHwQsMCowKKAmoCSGImh0dHA6Ly93d3cuc2suZWUvY3Jscy9qdXVyL2NybC5jcmwwHwYDVR0jBBgwFoAUBKp6R6Pkia8azwpApxg/b+/pfb4wHQYDVR0OBBYEFOU/DJ1xPW+8Gb+a9G6/Cf5A652WMA0GCSqGSIb3DQEBBQUAA4IBAQASvWB+YrgN23EMLW7C5/XUwQLNN1RMDhr6UzOo5XHZ3pxUXq2Erk5ggiS+UJIxkQaSg4OHRru8KTchoJDvS2neeYHOz05zJcAIwoy2GGkHq1iVN+QZaprDaDNYR5GGKgJb3FZrMtyX4dNwnrZzMFzd6t5YibCW+BDPAmqGJvNHzJ5YYdA7I3WT9Baan1ncKd4FtUVb54fppd19NkbCKKSUd7qRYDduNYqVs1C/C0qqLq4TrxoxoxSo+WNLiD01896sIRiPIy8qDOAXJU67382J5XXETe9wZO6o7+NaG0CrpzVY1OaaD2O6Wv/vSpxE2ugqaf0WsP35+coFCWdM2uHZ</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>CN=KLASS3-SK, SERIALNUMBER=1, OU=Sertifitseerimisteenused, O=AS Sertifitseerimiskeskus, C=EE, EMAILADDRESS=pki@sk.ee</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2002-05-08T12:07:17Z</StatusStartingTime> -+ <TSPServiceDefinitionURI> -+ <URI xml:lang="et">https://sk.ee/repositoorium/CP/</URI> -+ <URI xml:lang="en">https://sk.ee/en/repository/CP/</URI> -+ </TSPServiceDefinitionURI> -+ <ServiceInformationExtensions> -+ <Extension Critical="true"> -+ <ns5:Qualifications> -+ <ns5:QualificationElement> -+ <ns5:Qualifiers> -+ <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCForLegalPerson"/> -+ </ns5:Qualifiers> -+ <ns5:CriteriaList assert="atLeastOne"> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="nonRepudiation">false</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:Description>Any certificate issued under the CA/QC Sdi certificate and is issued as a QC (i.e. containing a QcCompliance statement) is to be considered as issued to a Legal Person</ns5:Description> -+ </ns5:CriteriaList> -+ </ns5:QualificationElement> -+ <ns5:QualificationElement> -+ <ns5:Qualifiers> -+ <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCWithSSCD"/> -+ </ns5:Qualifiers> -+ <ns5:CriteriaList assert="all"> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:Description>Any certificate that is issued under the CA/QC Sdi certificate and that is issued as a QC (i.e. containing a QcCompliance statement) and having its non-repudation bit set exclusively, is to be considered as supported by an SSCD. They are issued for digital stamping according to Estonian Digital Signature Act</ns5:Description> -+ </ns5:CriteriaList> -+ </ns5:QualificationElement> -+ <ns5:QualificationElement> -+ <ns5:Qualifiers> -+ <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCStatement"/> -+ </ns5:Qualifiers> -+ <ns5:CriteriaList assert="all"> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:Description>All certificates issued under this CA/QC service that have nonRepudiation bit set exclusively are issued as qualified certificates</ns5:Description> -+ </ns5:CriteriaList> -+ </ns5:QualificationElement> -+ </ns5:Qualifications> -+ </Extension> -+ </ServiceInformationExtensions> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/CA/QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">KLASS3-SK 2010: Qualified electronic seals</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509SubjectName>CN=KLASS3-SK 2010, OU=Sertifitseerimisteenused, O=AS Sertifitseerimiskeskus, C=EE</X509SubjectName> -+ </DigitalId> -+ <DigitalId> -+ <X509Certificate>MIID5TCCAs2gAwIBAgIES7MTKDANBgkqhkiG9w0BAQUFADBdMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMRAwDgYDVQQDEwdKdXVyLVNLMB4XDTEwMDMzMTA5MTcyOFoXDTE2MDgyNjE0MjMwMVowbTELMAkGA1UEBhMCRUUxIjAgBgNVBAoTGUFTIFNlcnRpZml0c2VlcmltaXNrZXNrdXMxITAfBgNVBAsTGFNlcnRpZml0c2VlcmltaXN0ZWVudXNlZDEXMBUGA1UEAxMOS0xBU1MzLVNLIDIwMTAwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrlaYRX2v89k8Hd0ADaOfnUcIn7iM6aOXkAR+jp5827ZhDqDyNddF9ZUoBgPghGNIrkHbH7qwex39YnI0ka24lCjcwEMvQMPbyPnX/a4RyJ+wEZttmjBl++FfrZK54L+vD7Dyy4YYB0Og9ktB4qptsDBj+giiv/MGPeGeNs3TacJdNb7+3splTPtPKlDfrufvq4H6jNOv9S9bC+j2VVY9uCFXUro8AA3hoOEKJdSjlpYCa51N8KGLVJYRuc/K81xqi054Jz+Cy/HY/AcXkk2JkxlpJoEXmcuTkxjO/QE/Xbd+mRJHnq6+HurOiKcxKwZCPAa+d+dvRPkbyq9ohMXH9AgMBAAGjgZwwgZkwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAcYwMwYDVR0fBCwwKjAooCagJIYiaHR0cDovL3d3dy5zay5lZS9jcmxzL2p1dXIvY3JsLmNybDAfBgNVHSMEGDAWgBQEqnpHo+SJrxrPCkCnGD9v7+l9vjAdBgNVHQ4EFgQUXXUUEYz0pY5Cj3uyQESj7tZ6O3IwDQYJKoZIhvcNAQEFBQADggEBADFuAGtSoO8PsWRw/QxFzc5EZtbq2KXC9yZ8YQPWBLY4Mh3OVLFJqWyKC+8JHy9D5tJTG49F5UHyDJPufD/XvC2rjRlkqvS/W7sy3MqGh7e+6bg+aD4mo+98Oalnqi12UD+ki+N8JKPXjHNJ31AvH6E/xDsCsvtzubylxI+FU8R0XODIUFbBqRtatRI1/zVaKRhD6LNGPt3rz/3IJKmuEv6b29mzL+p4oNULqpPr6aTmheZme8ZHuEIh3Zp5kdoX3i2D4hsmgClpevZifo196zeKRLk0Qs6nmRjoMxyk6jYIric3/VnV81oyhXSBY1GZnbM4qP1w2S5kSA2bb1pkwFo=</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509Certificate>MIIErDCCA5SgAwIBAgIQAznVp1LayatNgy6bN8f9QjANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQGEwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEoMCYGA1UEAwwfRUUgQ2VydGlmaWNhdGlvbiBDZW50cmUgUm9vdCBDQTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMB4XDTExMDMxODEwMDYxOFoXDTI0MDMxODEwMDYxOFowbTELMAkGA1UEBhMCRUUxIjAgBgNVBAoTGUFTIFNlcnRpZml0c2VlcmltaXNrZXNrdXMxITAfBgNVBAsTGFNlcnRpZml0c2VlcmltaXN0ZWVudXNlZDEXMBUGA1UEAxMOS0xBU1MzLVNLIDIwMTAwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrlaYRX2v89k8Hd0ADaOfnUcIn7iM6aOXkAR+jp5827ZhDqDyNddF9ZUoBgPghGNIrkHbH7qwex39YnI0ka24lCjcwEMvQMPbyPnX/a4RyJ+wEZttmjBl++FfrZK54L+vD7Dyy4YYB0Og9ktB4qptsDBj+giiv/MGPeGeNs3TacJdNb7+3splTPtPKlDfrufvq4H6jNOv9S9bC+j2VVY9uCFXUro8AA3hoOEKJdSjlpYCa51N8KGLVJYRuc/K81xqi054Jz+Cy/HY/AcXkk2JkxlpJoEXmcuTkxjO/QE/Xbd+mRJHnq6+HurOiKcxKwZCPAa+d+dvRPkbyq9ohMXH9AgMBAAGjggE+MIIBOjASBgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBxjCBlAYDVR0gBIGMMIGJMIGGBgsrBgEEAc4fZAEBATB3MCEGCCsGAQUFBwIBFhVodHRwczovL3d3dy5zay5lZS9jcHMwUgYIKwYBBQUHAgIwRh5EAEEAcwB1AHQAdQBzAGUAIABzAGUAcgB0AGkAZgBpAGsAYQBhAHQALgAgAEMAbwByAHAAbwByAGEAdABlACAASQBEAC4wHQYDVR0OBBYEFF11FBGM9KWOQo97skBEo+7WejtyMB8GA1UdIwQYMBaAFBLyWj7qVhy/zQas8fElyalL1BSZMD0GA1UdHwQ2MDQwMqAwoC6GLGh0dHA6Ly93d3cuc2suZWUvcmVwb3NpdG9yeS9jcmxzL2VlY2NyY2EuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQC3qNBgY2I9Wqm4LZYKAjCYkc2Nltm1RS9frMvQJ4aEE4Y4TtW2LPcQp2lenOf9aYdEB8G/E9CytZSPlFuvDdsdknj6fg1XCeu6ITR2wIkxJeAeLQvrFEfb1mcAa5tU9RNalZhYc7MFMFQTjQP+GBNxz+KIjNDVASFdv7TCe7GBjsW8Dfes9lQGHaWsBRkHCyuPGIHfH+cmMuhLtWqa4Qlg4f54kcsGO7s4buKtk6XqEj8Cj2ITdfk/aUs9QoxxkYWGwSUlCueTamzufXEJo9yz5Jp6IFdGjotmjb/EBUCf2sFfI83a4Cm1D3L3/KYb5g3cYlDEpPWNqbNuA1XosIqK</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2010-03-31T09:17:28Z</StatusStartingTime> -+ <TSPServiceDefinitionURI> -+ <URI xml:lang="en">https://sk.ee/en/repository/CP/</URI> -+ <URI xml:lang="et">https://sk.ee/repositoorium/CP/</URI> -+ </TSPServiceDefinitionURI> -+ <ServiceInformationExtensions> -+ <Extension Critical="true"> -+ <ns5:Qualifications> -+ <ns5:QualificationElement> -+ <ns5:Qualifiers> -+ <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCForLegalPerson"/> -+ </ns5:Qualifiers> -+ <ns5:CriteriaList assert="atLeastOne"> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="nonRepudiation">false</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:Description>Any certificate issued under the CA/QC Sdi certificate and is issued as a QC (i.e. containing a QcCompliance statement) is to be considered as issued to a Legal Person</ns5:Description> -+ </ns5:CriteriaList> -+ </ns5:QualificationElement> -+ <ns5:QualificationElement> -+ <ns5:Qualifiers> -+ <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCWithSSCD"/> -+ </ns5:Qualifiers> -+ <ns5:CriteriaList assert="all"> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:Description>Any certificate that is issued under the CA/QC Sdi certificate and that is issued as a QC (i.e. containing a QcCompliance statement) and having its non-repudation bit set exclusively, is to be considered as supported by an SSCD. They are issued for digital stamping according to Estonian Digital Signature Act</ns5:Description> -+ </ns5:CriteriaList> -+ </ns5:QualificationElement> -+ <ns5:QualificationElement> -+ <ns5:Qualifiers> -+ <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCStatement"/> -+ </ns5:Qualifiers> -+ <ns5:CriteriaList assert="all"> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:Description>All certificates issued under this CA/QC service that have nonRepudiation bit set exclusively are issued as qualified certificates</ns5:Description> -+ </ns5:CriteriaList> -+ </ns5:QualificationElement> -+ </ns5:Qualifications> -+ </Extension> -+ </ServiceInformationExtensions> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/Certstatus/OCSP/QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">OCSP, ESTEID-SK OCSP RESPONDER 2005</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDPDCCAiSgAwIBAgIEQi2iwTANBgkqhkiG9w0BAQUFADB8MRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMQ8wDQYDVQQLEwZFU1RFSUQxCjAIBgNVBAQTATExEjAQBgNVBAMTCUVTVEVJRC1TSzAeFw0wNTAzMDgxMzA0MDFaFw0xMjAxMTIxMzA0MDFaMG8xCzAJBgNVBAYTAkVFMQ8wDQYDVQQKEwZFU1RFSUQxDTALBgNVBAsTBE9DU1AxJjAkBgNVBAMTHUVTVEVJRC1TSyBPQ1NQIFJFU1BPTkRFUiAyMDA1MRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAI8mLeLkRHLxMNCB5Pz8R5DnvPdVxBS91PoHboLnbhjlp1ecByVosjwGpXCGu8tUPuv81Azgqq97AsSugM1J7Pu0gj4bg0Mf6O/9XyoT7RI7H0BuEn4KJQlFcw7tXizI5KUWFFZ4Qg8kfg0xwrDrLIjusBtRbeRARG3DhH8dgZBpAgMBAAGjVzBVMBMGA1UdJQQMMAoGCCsGAQUFBwMJMB8GA1UdIwQYMBaAFHgXtQX5s1jNWYzeZ15EBkx1hmldMB0GA1UdDgQWBBRM+GJhloJeOPpJDgvA0clxQXdnVTANBgkqhkiG9w0BAQUFAAOCAQEAfD8dP+swtSeigLxL3uUXV/tmQkjre7Ww39Uey71LdtxQ6zC7MDjcsLW13JaU0pRuu/p/eGe6h4/w46tSMsBx/U+D1WnHeCj1ED9SFWwfNQFVz9FkM5JEkPDm7lw5hHoxIghRHAC3NMbR3sCrVQA2YELf2WypslROoz8XlRT1LN4pwVehpBeWO7xbQPUtoaxKrSCGumtxtxA3KRJ7POHPTAH4cvipxaZhS1ZcXbKtxsesGW+7KLZirpTBT17ICXEA1CFXDWmJ8MHRhbeNWK3G1PERgTiGtBQV7Z00CzmJPHmb1yfcT27+WZ1W9tRQsjhGEWyMVkNnZooWHIjLpNucQA==</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>EMAILADDRESS=pki@sk.ee, CN=ESTEID-SK OCSP RESPONDER 2005, OU=OCSP, O=ESTEID, C=EE</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2005-03-08T14:04:01Z</StatusStartingTime> -+ <ServiceSupplyPoints> -+ <ServiceSupplyPoint>http://ocsp.sk.ee</ServiceSupplyPoint> -+ </ServiceSupplyPoints> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/Certstatus/OCSP/QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">OCSP, ESTEID-SK 2007 OCSP RESPONDER</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDnDCCAoSgAwIBAgIERZ0acjANBgkqhkiG9w0BAQUFADBbMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEPMA0GA1UECxMGRVNURUlEMRcwFQYDVQQDEw5FU1RFSUQtU0sgMjAwNzAeFw0wNzAxMDQxNTE3MDZaFw0xMDAxMDgxNTE3MDZaMG8xCzAJBgNVBAYTAkVFMQ8wDQYDVQQKEwZFU1RFSUQxDTALBgNVBAsTBE9DU1AxJjAkBgNVBAMTHUVTVEVJRC1TSyAyMDA3IE9DU1AgUkVTUE9OREVSMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAJmoB3SJCpPzcoHNqK1J0tRNQjgr5iuB27uE1VacIbITjD/Nc1AefKz5ydNPIaBNehm4yKxBYGxEeWOSJHVXyhJMg53EAUOw/45c46gvznXupHuJ6TEiGjh1pxaXTeLSnTqzNDZDAGQsOTgIbwGLa5U5ad8rXYu2YkJKsAfo6jT5AgMBAAGjgdcwgdQwEwYDVR0lBAwwCgYIKwYBBQUHAwkwEgYJKwYEBQUHMAEFBAUwAwQBMDCBiQYDVR0jBIGBMH+AFEgG3r6Mh1eVgHhj+pwjKyugOhh1oWGkXzBdMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMRAwDgYDVQQDEwdKdXVyLVNLggRFm6ANMB0GA1UdDgQWBBRJ/snw1GDL3fUH9n9Cpn8yhXiC7DANBgkqhkiG9w0BAQUFAAOCAQEAYzGkZD/uaXlWPeye1z5IiI83nmAjiJyvoj/r3BB9ZFWMX+ZY4Fz6/V/fzD0xXoeDpWbBKxcuctPXzXYxEH17n0/3yGOz8jhdJNBUCwRmd+96oHsU9aWSf+D2tiq1jPw6HVCiUYOhC/OWjg/+JpFlWsBV4gTW8/2PSGig85XlEsWLK7i7tIe60nnw/rWnfbCckMRcbrAF1L/JIlnUYUdkGOGQ9KPVqwR/MyWrwFIcSy2QIbcIaWMuiUc1nt8bmIXKoFZxbLzXYC00zba9cY7lSC4WPuhBtrQJ9JWb4OeoXd5j6O45UaH6XbarfrhER1GHL06cTyksT18p2L2GrMuEJg==</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>EMAILADDRESS=pki@sk.ee, CN=ESTEID-SK 2007 OCSP RESPONDER, OU=OCSP, O=ESTEID, C=EE</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2007-01-04T16:17:06Z</StatusStartingTime> -+ <ServiceSupplyPoints> -+ <ServiceSupplyPoint>http://ocsp.sk.ee</ServiceSupplyPoint> -+ </ServiceSupplyPoints> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/Certstatus/OCSP/QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">OCSP, ESTEID-SK 2007 OCSP RESPONDER 2010</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEkjCCA3qgAwIBAgIESxUPmTANBgkqhkiG9w0BAQUFADBbMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEPMA0GA1UECxMGRVNURUlEMRcwFQYDVQQDEw5FU1RFSUQtU0sgMjAwNzAeFw0wOTEyMDExMjQ1MDBaFw0xNjA4MjYxMzIzMDBaMIGHMQswCQYDVQQGEwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czENMAsGA1UECwwET0NTUDErMCkGA1UEAwwiRVNURUlELVNLIDIwMDcgT0NTUCBSRVNQT05ERVIgMjAxMDEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA48pyM/QfeiU1Kbu4AdcAUKXBiwbYbBl4gCltZHC5fZ77fKj2mqfPX2/XW1EqzbVvG0PYIkapkQzBr3R1S6Uaxh1DLC2Cc8BRnqmhXoE03o8En7N9xpN9dGGDBHp2aElBcVVZnAvF4jgbPDCNFAeo3cvpjIx18n0URiVOZFEdxDvF8PFo/exKXtjRM+jk3K6+9doHYvSXn9klFbT8Wge87Qdll3gQzZE3L8QMXF0z4xbBH1lyTmVLt5yZ0fxoE0jNlZFvn2w2EDnU4CKfId8w6Zjd5kdxomcwDzGuuLzdiJllPt05USJcY4FHn9YAVKWmofYY/o6xOUzU8fAz6yA1tQIDAQABo4IBLzCCASswEwYDVR0lBAwwCgYIKwYBBQUHAwkwaQYDVR0gBGIwYDBeBgorBgEEAc4fBAECMFAwJQYIKwYBBQUHAgIwGRoXU0sgdGltZSBzdGFtcGluZyBwb2xpY3kwJwYIKwYBBQUHAgEWG2h0dHA6Ly93d3cuc2suZWUvYWphdGVtcGVsLzCBiQYDVR0jBIGBMH+AFEgG3r6Mh1eVgHhj+pwjKyugOhh1oWGkXzBdMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMRAwDgYDVQQDEwdKdXVyLVNLggRFm6ANMB0GA1UdDgQWBBQ4AhAwumZ6EXROIl5wZQXedXpOFDANBgkqhkiG9w0BAQUFAAOCAQEAJ/LvPUevNRcBp+J78fZRofhk/ifKNLxCUoh8T3MjtU9u5R0KojRlye+1NU8MqH/zrKhr6TPxuXD0cRrFQ9Hy60II7IzzaegrQVNgq7UgQINvCuNxWZcGtEa3ba9M7tBpQeFxqp3CpBytGeVuXn65hqOBKdp/zYEiMUUkYNAT5A6SSPYLAOgARCI/ydBx+cw0l0fwYvw72FKZa2Mlt5DmXBccCtrQ4l/sb95xfANCNe5n5sBvBhY4F+sIWZUVJ8fTVh7iGaVPSayQfeAAei0m/4/ksiXBwfx6qhzyB3yqcnSk489oBrrCegua/t+3LizfHpNZvDphKMPuAZ4uheLfQA==</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>EMAILADDRESS=pki@sk.ee, CN=ESTEID-SK 2007 OCSP RESPONDER 2010, OU=OCSP, O=AS Sertifitseerimiskeskus, C=EE</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2009-12-01T13:45:00Z</StatusStartingTime> -+ <ServiceSupplyPoints> -+ <ServiceSupplyPoint>http://ocsp.sk.ee</ServiceSupplyPoint> -+ </ServiceSupplyPoints> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/Certstatus/OCSP/QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">OCSP, EID-SK 2007 OCSP RESPONDER</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDOjCCAiKgAwIBAgIERh9YjTANBgkqhkiG9w0BAQUFADBqMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEhMB8GA1UECxMYU2VydGlmaXRzZWVyaW1pc3RlZW51c2VkMRQwEgYDVQQDEwtFSUQtU0sgMjAwNzAeFw0wNzA0MTMxMDE2NDVaFw0xMDA0MTcwOTE2NDVaMH8xCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMQ0wCwYDVQQLEwRPQ1NQMSMwIQYDVQQDExpFSUQtU0sgMjAwNyBPQ1NQIFJFU1BPTkRFUjEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD+Z0LZ6TjBzx4x+UshExea1nIMsS86xAN6u/amLV8XQE+vodEld8iqtRsrvFiQ74isYOys1JKqiq+1ryic6j2FnMDZueLiXZl51QWyuhWu+aT4BwEaA8rUxMgKJ94zWksrqSf9cjoaap+9DlDhEsrDa+/89CPl2rlZIB5lqeHLQQIDAQABo1cwVTATBgNVHSUEDDAKBggrBgEFBQcDCTAfBgNVHSMEGDAWgBQcB/Scv6QlbLO0niIfH5RIG1h6jTAdBgNVHQ4EFgQUMsMzikmZqG6CcdgnD5VAXfQeCrgwDQYJKoZIhvcNAQEFBQADggEBAH0eUFQ7LznD4R8XWj/6rsNhe0fme3Os7cyZGNkx1EWenkgdMHCV/gN3SyIfrjW7sEJM62sS1X+8Ke2J+6b5YH0TcSmSDqYICn6zVbsq5MLtHW5wmwKucBJ5xFgoC3NNCEp8wVrzuQmm6xCvFWQVQ6uNhjuxCQxcDKgLwpL7iEcBEMmTTKkvqEtqrvu/LZ/a2OHytkEoXGheN8KlEcIv7AJBPVL8OCv4UpgyUOrVnmIeX2F/KG3wmo4U3kVupuF9kaPrOeOGYG3ZzK2HNwfRNkZ/Ej7AuPazkumAHdsJBbpTdBYq8d8er8XZKai24Ra/e5eEmcMye+O8IpxAA4ExY+I=</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>EMAILADDRESS=pki@sk.ee, CN=EID-SK 2007 OCSP RESPONDER, OU=OCSP, O=AS Sertifitseerimiskeskus, C=EE</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2007-04-13T10:16:45Z</StatusStartingTime> -+ <ServiceSupplyPoints> -+ <ServiceSupplyPoint>http://ocsp.sk.ee</ServiceSupplyPoint> -+ </ServiceSupplyPoints> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/Certstatus/OCSP/QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">OCSP, EID-SK 2007 OCSP RESPONDER 2010</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEMTCCAxmgAwIBAgIESxUA8TANBgkqhkiG9w0BAQUFADBqMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEhMB8GA1UECxMYU2VydGlmaXRzZWVyaW1pc3RlZW51c2VkMRQwEgYDVQQDEwtFSUQtU0sgMjAwNzAeFw0wOTEyMDExMTQxMzBaFw0xNjA4MjYxMzIzMDBaMIGEMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czENMAsGA1UECxMET0NTUDEoMCYGA1UEAxMfRUlELVNLIDIwMDcgT0NTUCBSRVNQT05ERVIgMjAxMDEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAso91KG7EHsjAxMairaCKUHSOyXp5rzxRq5Y9LfDyplVbHfh34fbB7M5G+wnu5CZgJsfJ7DF3MjpA7nlAHd5alAynIUl/CNXejf+XnJ/vyF1eQvAoWvnjBPVIS0mbaABgF54ybAGE2E7UKeZVOAj7RoQVAMHQcYVjxZW5OWz3yJX9KdaDZPOzqlGtRYKUASHiwAFwExKcqfaHOj0qO8+KdSvEBaVlpe5kunEVEvn+kgNKBtzdH2XFMjVFa4im31KW+iq7mNQwUiZDSe9ho6T6UrWu7g8yTQowx3SYLTqVxR0YVgcYNCx7nn1AVGNxK3oeonrHHqcBp6qSAIYXeQNfiQIDAQABo4HDMIHAMBMGA1UdJQQMMAoGCCsGAQUFBwMJMGkGA1UdIARiMGAwXgYKKwYBBAHOHwQBAjBQMCUGCCsGAQUFBwICMBkaF1NLIHRpbWUgc3RhbXBpbmcgcG9saWN5MCcGCCsGAQUFBwIBFhtodHRwOi8vd3d3LnNrLmVlL2FqYXRlbXBlbC8wHwYDVR0jBBgwFoAUHAf0nL+kJWyztJ4iHx+USBtYeo0wHQYDVR0OBBYEFPBOCDPMR+kfp7Ozk5U68E68/AseMA0GCSqGSIb3DQEBBQUAA4IBAQCRaqmxZgJiJ+MLamb/P4vyS6azr6/tj8dZCK++V/3GnecRm7CiZpR47EnW0NyDzCecGyTWSkVlnZPnNvXRx700Nn0M4Inia5pNhSuVmWS3p5eV70vCbsfRD26+6CZhkHWnL/J2xpqeacULtgPPz9gBTyC2ybQr17dv7W5Qc+3UFywmE5N8ozQuEJroGz7P+yCbBEssWcmIUNDNdO0xs6aQZ1f+DV4FUB0lajuILYFz4xM+81akYFVqaGPCVwbQgFSWRKmamj8FxfWjA4DCrgkHVR1rA3tZyirfCBK9cfWpTCLr8zq9Ur0jTAeGrHRzHlUrB9mYZwyr0kNOyl9293xh</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>EMAILADDRESS=pki@sk.ee, CN=EID-SK 2007 OCSP RESPONDER 2010, OU=OCSP, O=AS Sertifitseerimiskeskus, C=EE</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2009-12-01T12:41:30Z</StatusStartingTime> -+ <ServiceSupplyPoints> -+ <ServiceSupplyPoint>http://ocsp.sk.ee</ServiceSupplyPoint> -+ </ServiceSupplyPoints> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/Certstatus/OCSP/QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">OCSP, KLASS3-SK OCSP RESPONDER 2009</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDzzCCAregAwIBAgIEScskSjANBgkqhkiG9w0BAQUFADCBjjEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEhMB8GA1UECxMYU2VydGlmaXRzZWVyaW1pc3RlZW51c2VkMQowCAYDVQQFEwExMRIwEAYDVQQDEwlLTEFTUzMtU0swHhcNMDkwMzI2MDY0NDI2WhcNMTIwNTA0MDU0NDI2WjCBgjELMAkGA1UEBhMCRUUxIjAgBgNVBAoTGUFTIFNlcnRpZml0c2VlcmltaXNrZXNrdXMxDTALBgNVBAsTBE9DU1AxJjAkBgNVBAMTHUtMQVNTMy1TSyBPQ1NQIFJFU1BPTkRFUiAyMDA5MRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKi6weNl7Wj7sL6JD4YUNt/JXQ79KL53x5m4QGRsijGJaV5YggE5rJyVZGlsX4FSd9JFIV597ypAUGDbLPf0nDdlSIGteP7zamyETI3GI6bKfkeUuIE707r7uC+8FFe9iHOOL20+pi7WFzwnyXT9yuWs0eCoKdjQvLpMiq0MBIm9AgMBAAGjgcIwgb8wEwYDVR0lBAwwCgYIKwYBBQUHAwkwaAYDVR0gBGEwXzBdBgorBgEEAc4fBAECME8wJQYIKwYBBQUHAgIwGRoXU0sgdGltZSBzdGFtcGluZyBwb2xpY3kwJgYIKwYBBQUHAgEWGmh0dHA6Ly93d3cuc2suZWUvYWphdGVtcGVsMB8GA1UdIwQYMBaAFOU/DJ1xPW+8Gb+a9G6/Cf5A652WMB0GA1UdDgQWBBT59PTkSIzYXNBxQQnAhqH3BtED0TANBgkqhkiG9w0BAQUFAAOCAQEAhyl3H6fo1bz3mD0JcD4eY1slcwec92Qgkn6i9TsO5TlDQCJxiC/80zlh+H5dgIMcNQ6gNbr1cWsUw7xAanv2hGlg20IWq7uCyy5LDghFpO2BWDzTJjmiVTXzyVEvqST0W6efDiwi1tA8H7b+aAzc9ItWm7pYlucGvneKJq07t/UvU9ONSDUfVLPNMr8slwCMOexVDZ+eiBlvrLL3N7NouPs7UpFh/+m5JsERmeLbbrNYimHUUn2PJ/trJ3kBEVFToO+nFdBElfzC3bjSlbPXFxSOL+AqSgvRIaB4CEWUxa33wzoZNaVpCh5AupxQOGdr4u7ajw5hkV8Y9VZ7OFej6A==</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>EMAILADDRESS=pki@sk.ee, CN=KLASS3-SK OCSP RESPONDER 2009, OU=OCSP, O=AS Sertifitseerimiskeskus, C=EE</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2009-03-26T07:44:26Z</StatusStartingTime> -+ <ServiceSupplyPoints> -+ <ServiceSupplyPoint>http://ocsp.sk.ee</ServiceSupplyPoint> -+ </ServiceSupplyPoints> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/Certstatus/OCSP/QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">OCSP, KLASS3-SK 2010 OCSP RESPONDER</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIELzCCAxegAwIBAgICAMswDQYJKoZIhvcNAQEFBQAwbTELMAkGA1UEBhMCRUUxIjAgBgNVBAoTGUFTIFNlcnRpZml0c2VlcmltaXNrZXNrdXMxITAfBgNVBAsTGFNlcnRpZml0c2VlcmltaXN0ZWVudXNlZDEXMBUGA1UEAxMOS0xBU1MzLVNLIDIwMTAwHhcNMTAwNDA4MDgwMTMxWhcNMTYwODI1MjIwMDAwWjCBgjEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czENMAsGA1UECxMET0NTUDEmMCQGA1UEAxMdS0xBU1MzLVNLIDIwMTAgT0NTUCBSRVNQT05ERVIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDhWwGpngF0sdGCgOgiyT12A/Vdm9sMPr/cUwZhU7DA5C8rU1yJhbrh28fMpv0eas6/+IC1oDxI24zjfWIKfHwpBmhUTFsmvmKRIu4a1F6VwNwYEdoAZrQDpzZSve6H6R/+0Uy0BAolebdhPUK22pKd8V1CBY3de886Ray8uUJu09MAU8j+xsoUNOzyxiWdAVp1YTXRhhUt+EQVYJ22RBZ6+b9fPQvgb9aWgE/WwqUh7OrgTnrGZVzgO46prfE7zkALG0FYZCzQTCMH8aIqqte0E3HwSVlKh9qwbRPB9WTDCtCqajh4qgGRTXvWT4vATlHvx8GpJ3roZkp5AlQno3hTAgMBAAGjgcIwgb8waAYDVR0gBGEwXzBdBgorBgEEAc4fBAECME8wJQYIKwYBBQUHAgIwGRoXU0sgdGltZSBzdGFtcGluZyBwb2xpY3kwJgYIKwYBBQUHAgEWGmh0dHA6Ly93d3cuc2suZWUvYWphdGVtcGVsMBMGA1UdJQQMMAoGCCsGAQUFBwMJMB8GA1UdIwQYMBaAFF11FBGM9KWOQo97skBEo+7WejtyMB0GA1UdDgQWBBQ3MJkXG2Go/6j4bem465aue3P5qjANBgkqhkiG9w0BAQUFAAOCAQEAKhoVTII1ECecFkyt9Ogr0XW3WEFprrqTDE4IycMlx+LNjWk30aknMldEtzIC5nCDX27NCWkpbN1o/3ddBv0cKMa05ZK8sHQxU6A5Oev8DCp72/LFEChq5IDqgqW2BiHhyfPfr93JIuV03b/Wgq3fpRyBd21VE9254W4A90xeNxDvdpqxlrD2Lonzm/V/oomzEHsp4kKxXkPmRU4vGtTnxxAnxYp9OuLkvpUCLNoAWMbYqb4cbYzaZ9tQIkBy3nJ352Rs5obYDb3R/ZVWuYLLSocWL7b2QwlDP7LA8VNDqmQvioHt8GcyKXQ5/eWMvj2ePt58waVhwfSdd4nANKtq1g==</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>CN=KLASS3-SK 2010 OCSP RESPONDER, OU=OCSP, O=AS Sertifitseerimiskeskus, C=EE, EMAILADDRESS=pki@sk.ee</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2010-04-08T08:01:31Z</StatusStartingTime> -+ <ServiceSupplyPoints> -+ <ServiceSupplyPoint>http://ocsp.sk.ee</ServiceSupplyPoint> -+ </ServiceSupplyPoints> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/Certstatus/OCSP/QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">OCSP, SK OCSP RESPONDER 2011</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEvDCCA6SgAwIBAgIQcpyVmdruRVxNgzI3N/NZQTANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQGEwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEoMCYGA1UEAwwfRUUgQ2VydGlmaWNhdGlvbiBDZW50cmUgUm9vdCBDQTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMB4XDTExMDMxODEwMjE0M1oXDTI0MDMxODEwMjE0M1owgZ0xCzAJBgNVBAYTAkVFMQ4wDAYDVQQIEwVIYXJqdTEQMA4GA1UEBxMHVGFsbGlubjEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czENMAsGA1UECxMET0NTUDEfMB0GA1UEAxMWU0sgT0NTUCBSRVNQT05ERVIgMjAxMTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAihvGyhMVrgReHluKln1za6gvCE/mlSREmWjJFpL9llvuEUZoPFIypYA8g5u1VfgkeW5gDq25jAOq4FyXeDGIa+pJn2h0o2Wc2aeppVG/emfGm/jA8jjeyMrwH8fAJrqVQ7c9X2xSwJEch/P2d8CfMZt5YF6gqLtPvG1b+n6otBZA5wjIFfJ/inJBMUvqHSz3+PLfxO2/T3Wyk/c8M9HIMqTelqyiMGRgWehiU1OsL9armv3dQrHs1wm6vHaxfpfWB9YAFpeo9aYqhPCxVt/zo2NQB6vxyZS0hsOrXL7SxRToOJaqsnvlbf0erPPFtRHUvbojYYgl+fzlz0Jt6QJoNwIDAQABo4IBHTCCARkwEwYDVR0lBAwwCgYIKwYBBQUHAwkwHQYDVR0OBBYEFKWhSGFt537NmJ50nCm7vYrecgxZMIGCBgNVHSAEezB5MHcGCisGAQQBzh8EAQIwaTA+BggrBgEFBQcCAjAyHjAAUwBLACAAdABpAG0AZQAgAHMAdABhAG0AcABpAG4AZwAgAHAAbwBsAGkAYwB5AC4wJwYIKwYBBQUHAgEWG2h0dHBzOi8vd3d3LnNrLmVlL2FqYXRlbXBlbDAfBgNVHSMEGDAWgBQS8lo+6lYcv80GrPHxJcmpS9QUmTA9BgNVHR8ENjA0MDKgMKAuhixodHRwOi8vd3d3LnNrLmVlL3JlcG9zaXRvcnkvY3Jscy9lZWNjcmNhLmNybDANBgkqhkiG9w0BAQUFAAOCAQEAw2sKwvTHtYGtD8Jw9mNUuj/mWiBSBEBeY2LhW8V6tjBPAPp3s6iWOh0FbVR2LUyrqRwgT3fyWiGsiDm/6cIqM+IblLp/8ztfRQjquhW6XCD9SK02OQ9ZSdBwcmoAApZLGXQC34wdgmV/hLTTNxONnDACBKz9U+Dy9a4ZT4tpNkbH8jq/BMne8FzbvRt1bjpXBP7gjLX+zdx8/hp0Wq4tD+f9NVX0+vm9ahEKuzx4QzPnSB7hhWM9OnLZT7noRQa+KWk5c+e5VoR5R2t7MjVl8Cd+2llxiSxqMSbU5/23BzAKgN+NQdrBZAzpZ7lfaAuLFaICP+bAm6uW2JUrM6abOw==</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>EMAILADDRESS=pki@sk.ee, CN=SK OCSP RESPONDER 2011, OU=OCSP, O=AS Sertifitseerimiskeskus, L=Tallinn, ST=Harju, C=EE</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2011-03-18T11:21:43Z</StatusStartingTime> -+ <ServiceSupplyPoints> -+ <ServiceSupplyPoint>http://ocsp.sk.ee</ServiceSupplyPoint> -+ </ServiceSupplyPoints> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/Certstatus/OCSP/QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">OCSP, SK Proxy OCSP Responder 2009</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEUjCCAzqgAwIBAgIESg1N9TANBgkqhkiG9w0BAQUFADCBjjEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEhMB8GA1UECxMYU2VydGlmaXRzZWVyaW1pc3RlZW51c2VkMQowCAYDVQQFEwExMRIwEAYDVQQDEwlLTEFTUzMtU0swHhcNMDkwNTE1MTExMTQ5WhcNMTIwNTA1MTEwNzE3WjCBgTELMAkGA1UEBhMCRUUxIjAgBgNVBAoTGUFTIFNlcnRpZml0c2VlcmltaXNrZXNrdXMxDTALBgNVBAsTBE9DU1AxJTAjBgNVBAMTHFNLIFByb3h5IE9DU1AgUmVzcG9uZGVyIDIwMDkxGDAWBgkqhkiG9w0BCQEWCXBraUBzay5lZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ6rr1AZFPunWKMJAse70wx9Utc57qgbrJdk8iiOrcUN2FApNal2wFnRIw9rsF8u9KPu3g47ZSuKKYkpdVVupTwt6gK+brQczfQShO3xOCj7cubcl5+6jDPXSh47zma10hh4tJ5VECOiCDBhIRfA/UJfMYj6BYgEhFuRQxEBgAF5yyEJX1X8Sco/GQcha4Er5SyEhHvXu/vvg0OVfLRqH/7gGBBRLPMOsDImmXf+C0UYKs7ywFBf+M0VnWH9u0p7E8XzA8s3m2ivTdU/JYIU5Zy7NFeV9NJgZw3iaLCO1dbV2gBIWpgGvqlwQ3coKHMs3tMBT25+WWmKVMsHFi254ysCAwEAAaOBwjCBvzATBgNVHSUEDDAKBggrBgEFBQcDCTBoBgNVHSAEYTBfMF0GCisGAQQBzh8EAQIwTzAlBggrBgEFBQcCAjAZGhdTSyB0aW1lIHN0YW1waW5nIHBvbGljeTAmBggrBgEFBQcCARYaaHR0cDovL3d3dy5zay5lZS9hamF0ZW1wZWwwHwYDVR0jBBgwFoAU5T8MnXE9b7wZv5r0br8J/kDrnZYwHQYDVR0OBBYEFCRXW4FmpJ/GGw3/AXu5czpgogbJMA0GCSqGSIb3DQEBBQUAA4IBAQB9U7sG/M/w7eXBQh5tDOZ7XLCRmhrmGk9+1RdAP54SmMzc1nnglmfgl13ncaizPleu0p8541a51XCYqQMJbry47YkEnq48ImiAjEpkbaCZsZhX06uUpA9DlstEW/wBZzSCUoGsklbBolwTWAP97B7trizPe102hNvD5IMaXrMqaH9hQcoYmKyJHBQnxW2bXxYjeXvIDcAQvevLP8IIOLqdib029GFcM7U889FaBcO4cPxx4kITXC2hAvdiZwGuDVAz15Byl8RAfNWrlmv+IBRSQpAecnLYozJYyRNcFPrYLd9aXbej6p6sRCHgC452czoM0VbMmisrK8pm6yZ0J1r+</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>EMAILADDRESS=pki@sk.ee, CN=SK Proxy OCSP Responder 2009, OU=OCSP, O=AS Sertifitseerimiskeskus, C=EE</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2009-05-15T11:11:49Z</StatusStartingTime> -+ <ServiceSupplyPoints> -+ <ServiceSupplyPoint>http://ocsp.sk.ee</ServiceSupplyPoint> -+ </ServiceSupplyPoints> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/Certstatus/OCSP/QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">OCSP, ESTEID-SK OCSP RESPONDER</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDuDCCAqCgAwIBAgIEPJilyDANBgkqhkiG9w0BAQUFADB8MRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMQ8wDQYDVQQLEwZFU1RFSUQxCjAIBgNVBAQTATExEjAQBgNVBAMTCUVTVEVJRC1TSzAeFw0wMjAzMjAxNTA3NTJaFw0wNTAzMjQxNTA3NTJaMGoxCzAJBgNVBAYTAkVFMQ8wDQYDVQQKEwZFU1RFSUQxDTALBgNVBAsTBE9DU1AxITAfBgNVBAMTGEVTVEVJRC1TSyBPQ1NQIFJFU1BPTkRFUjEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC10BeCObXZZWcDX298Wqfd16hpi9tuSbT4L+kowTj+aWz7PDsFpKQWqhxCdlicu67xCT0zAAjaK6x9cwasiIdre++IkscRi00w20G5nTPocxpwGTHqwHx4ED7cceK4t4pbj/zB8FluVNVii8ouG9ZEhH76j/Icx0X27Sq5AS0CwwIDAQABo4HXMIHUMBMGA1UdJQQMMAoGCCsGAQUFBwMJMBIGCSsGBAUFBzABBQQFMAMEATAwgYkGA1UdIwSBgTB/gBR4F7UF+bNYzVmM3mdeRAZMdYZpXaFhpF8wXTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEQMA4GA1UEAxMHSnV1ci1TS4IEPERcgjAdBgNVHQ4EFgQUzpYj2gwlDYK9ahyGyKa0AkK5ys0wDQYJKoZIhvcNAQEFBQADggEBADrq0tGkwsrddEqUbsOpXi75Xs4GVkOyseysNqZZCvLqCF7qTSMiC+fzRxQbXQDhuOT7QQvi3JAoA5zTIm2RvIO1fmrVnJ6CsObjxxvXtcSLI+bICG4uQYgEA+duDRgICpmtCCjtmxb+2/cSJLGioaKiwn0YwgeEowOgjDMh2o4otm6FjtyT1GZsZm56U7WkFa7tSwkHKw427iZUWVrED6W9AfATY14rNnAk8Jqz06w4rPnGE4kYjO+UqMLmFU2KImdrTp1O7h4YLCVlxH/e/He8r7FSgzXSG4EqlD/TMEdCLu7DSWR3SEgJPvKWCpNWzv2DRldHp+kQO3k+R/f2c80=</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>EMAILADDRESS=pki@sk.ee, C=EE, O=ESTEID, OU=OCSP, CN=ESTEID-SK OCSP RESPONDER</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2002-03-20T16:07:52Z</StatusStartingTime> -+ <ServiceSupplyPoints> -+ <ServiceSupplyPoint>http://ocsp.sk.ee</ServiceSupplyPoint> -+ </ServiceSupplyPoints> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/Certstatus/OCSP</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">OCSP, KLASS3-SK OCSP RESPONDER (from 2003)</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDXTCCAkWgAwIBAgIEPolzuzANBgkqhkiG9w0BAQUFADCBjjEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEhMB8GA1UECxMYU2VydGlmaXRzZWVyaW1pc3RlZW51c2VkMQowCAYDVQQFEwExMRIwEAYDVQQDEwlLTEFTUzMtU0swHhcNMDMwNDAxMTExMDUxWhcNMDYwNDA1MTAxMDUxWjB9MQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czENMAsGA1UECxMET0NTUDEhMB8GA1UEAxMYS0xBU1MzLVNLIE9DU1AgUkVTUE9OREVSMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALXQF4I5tdllZwNfb3xap93XqGmL225JtPgv6SjBOP5pbPs8OwWkpBaqHEJ2WJy7rvEJPTMACNorrH1zBqyIh2t774iSxxGLTTDbQbmdM+hzGnAZMerAfHgQPtxx4ri3iluP/MHwWW5U1WKLyi4b1kSEfvqP8hzHRfbtKrkBLQLDAgMBAAGjVzBVMBMGA1UdJQQMMAoGCCsGAQUFBwMJMB8GA1UdIwQYMBaAFOU/DJ1xPW+8Gb+a9G6/Cf5A652WMB0GA1UdDgQWBBTOliPaDCUNgr1qHIbIprQCQrnKzTANBgkqhkiG9w0BAQUFAAOCAQEAd/8FCyPC9zXxcAZN67KCNU4+XNJ8e+LmG602lBe+lS7Pw4pOgMKebgULKh1fEBHQ2K7FSUWMZdPWkDHaKVRh646yVbFZbfEmKNq4LhRf13/hoUdrG5uRVmCsV03WSfgfUVfb1cZf8tDMIwCmsNXu22k9wykeHallpUmGUfbVZygqfKE2NVQpm2FULiKWBFKXqbMtW5R3xmDS3bjrAIAdUdYhxhfdCHCphsQf/FJlxb8UFOUa8SeRNr5eL7s8znLnrC5pKPpWGbUNSlrhLJZHIeXfwbOamae6UVvjto6bMqRe2sxCsMA0dGz+tMiglfmTVInxpEKBkyvF/on/2qwtVw==</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>EMAILADDRESS=pki@sk.ee, C=EE, O=AS Sertifitseerimiskeskus, OU=OCSP, CN=KLASS3-SK OCSP RESPONDER</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2003-04-01T11:10:51Z</StatusStartingTime> -+ <ServiceSupplyPoints> -+ <ServiceSupplyPoint>http://ocsp.sk.ee</ServiceSupplyPoint> -+ </ServiceSupplyPoints> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/Certstatus/OCSP/QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">OCSP, KLASS3-SK OCSP RESPONDER (from 2006)</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDXTCCAkWgAwIBAgIERCKLGDANBgkqhkiG9w0BAQUFADCBjjEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEhMB8GA1UECxMYU2VydGlmaXRzZWVyaW1pc3RlZW51c2VkMQowCAYDVQQFEwExMRIwEAYDVQQDEwlLTEFTUzMtU0swHhcNMDYwMzIzMTE0ODQwWhcNMDkwMzI3MTE0ODQwWjB9MQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czENMAsGA1UECxMET0NTUDEhMB8GA1UEAxMYS0xBU1MzLVNLIE9DU1AgUkVTUE9OREVSMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKKTI8Aex0Gva9eeeBkM3fGTiNOEvjj2McN3tOJBMAEvG/G7Npu0/2fAEKFFUv4NnPyH3MiC7s6R8PtPMhV5GBG6kWVztL/gQnlIjAbo1l654+jApIQjT3vdVZDIYyS6lKlYoAdG40CgLlVtRihargQ77azlfORkyRfhKZcSQe8tAgMBAAGjVzBVMBMGA1UdJQQMMAoGCCsGAQUFBwMJMB8GA1UdIwQYMBaAFOU/DJ1xPW+8Gb+a9G6/Cf5A652WMB0GA1UdDgQWBBQUQsudE6pYaIJSuWurylGItfy52DANBgkqhkiG9w0BAQUFAAOCAQEAV+Vu+qzrHe7HDjMHq9DdOQTz833QcMRY0huSgphMOgqNjqjPqTNpHPgNvE6HKGdQ0+VWr8IyRWcxnPMZNihmaCGMpFMpYuH0fx9nsjXDbjat8MfGuX2m1EADGOwjtjMuoYTEGEUe3MBeFkmPFDIYpeuS+I4Qv34tOsGvFOpsDkobSATq4EFw/5hI9WfWaEMYkmBXdeokoVjbNpt+gtdGKNBU42AlxLrcc+YzAE1hj5qH99/hl0X6r63pTjUb1ZMRjGQg7ELwmddms7wB5LKKi5kbfmag5hBtDKGs2s0xW1be4ylNOrT9lqUYuPn9lwcHNg1IS42mYVChV97Tlt/5vw==</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>EMAILADDRESS=pki@sk.ee, C=EE, O=AS Sertifitseerimiskeskus, OU=OCSP,CN=KLASS3-SK OCSP RESPONDER</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2006-03-23T12:48:40Z</StatusStartingTime> -+ <ServiceSupplyPoints> -+ <ServiceSupplyPoint>http://ocsp.sk.ee</ServiceSupplyPoint> -+ </ServiceSupplyPoints> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/Certstatus/OCSP</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">OCSP, SK Proxy OCSP Responder 2008</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEgTCCA2mgAwIBAgIESQbcTzANBgkqhkiG9w0BAQUFADCBjjEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEhMB8GA1UECxMYU2VydGlmaXRzZWVyaW1pc3RlZW51c2VkMQowCAYDVQQFEwExMRIwEAYDVQQDEwlLTEFTUzMtU0swHhcNMDgxMDI4MDkzMzAzWhcNMTExMTAyMDgzMzAzWjCBlTELMAkGA1UEBhMCRUUxIjAgBgNVBAoTGUFTIFNlcnRpZml0c2VlcmltaXNrZXNrdXMxITAfBgNVBAsTGFNlcnRpZml0c2VlcmltaXN0ZWVudXNlZDElMCMGA1UEAxMcU0sgUHJveHkgT0NTUCBSZXNwb25kZXIgMjAwODEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnquvUBkU+6dYowkCx7vTDH1S1znuqBusl2TyKI6txQ3YUCk1qXbAWdEjD2uwXy70o+7eDjtlK4opiSl1VW6lPC3qAr5utBzN9BKE7fE4KPty5tyXn7qMM9dKHjvOZrXSGHi0nlUQI6IIMGEhF8D9Ql8xiPoFiASEW5FDEQGAAXnLIQlfVfxJyj8ZByFrgSvlLISEe9e7+++DQ5V8tGof/uAYEFEs8w6wMiaZd/4LRRgqzvLAUF/4zRWdYf27SnsTxfMDyzebaK9N1T8lghTlnLs0V5X00mBnDeJosI7V1tXaAEhamAa+qXBDdygocyze0wFPbn5ZaYpUywcWLbnjKwIDAQABo4HdMIHaMA4GA1UdDwEB/wQEAwIHgDATBgNVHSUEDDAKBggrBgEFBQcDCTBoBgNVHSAEYTBfMF0GCisGAQQBzh8EAQIwTzAlBggrBgEFBQcCAjAZGhdTSyB0aW1lIHN0YW1waW5nIHBvbGljeTAmBggrBgEFBQcCARYaaHR0cDovL3d3dy5zay5lZS9hamF0ZW1wZWwwHwYDVR0jBBgwFoAU5T8MnXE9b7wZv5r0br8J/kDrnZYwHQYDVR0OBBYEFCRXW4FmpJ/GGw3/AXu5czpgogbJMAkGA1UdEwQCMAAwDQYJKoZIhvcNAQEFBQADggEBALnuqrbcM13+ISq6lzIbwaHr6Om2zAialZcAAU0i++lqs1lLTSA/cXoRuUIcjJ54Csh9pVPt3tJ76193H57ICkeKE+YhpHKFTdD3tPtgAU0prOlwiVq7Gh5MR+sMNX2TKaWTj0qd8Vgeui4MB5uWSUWYCNlKnmgoZbV+Zt0AyBHQVG9oRbqcEfK1iPUJw/sjkDUdghUHNUTcXpXfIPWCEvhQz+BX3TRNkR4NREvAwT/tHVtweJi+mr7RPrbtvdYBjdTppFwZVZDpGC34AM6KtL+mpVeGkK73h5V/pDvQ1rmLQn2L2GJe6n9ztghE/BB5zYJ1hWACaoJh5lEm+6xNPyU=</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>EMAILADDRESS=pki@sk.ee, C=EE, O=AS Sertifitseerimiskeskus, OU=Sertifitseerimisteenused, CN=SK Proxy OCSP Responder 2008</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2008-10-28T10:33:03Z</StatusStartingTime> -+ <ServiceSupplyPoints> -+ <ServiceSupplyPoint>http://ocsp.sk.ee</ServiceSupplyPoint> -+ </ServiceSupplyPoints> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">SK TIMESTAMPING AUTHORITY</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEDTCCAvWgAwIBAgIQJK/s6xJo0AJUF/eG7W8BWTANBgkqhkiG9w0BAQsFADB1MQswCQYDVQQGEwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEoMCYGA1UEAwwfRUUgQ2VydGlmaWNhdGlvbiBDZW50cmUgUm9vdCBDQTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMB4XDTE0MDkxNjA4NDAzOFoXDTE5MDkxNjA4NDAzOFowYzELMAkGA1UEBhMCRUUxIjAgBgNVBAoMGUFTIFNlcnRpZml0c2VlcmltaXNrZXNrdXMxDDAKBgNVBAsMA1RTQTEiMCAGA1UEAwwZU0sgVElNRVNUQU1QSU5HIEFVVEhPUklUWTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJPa/dQKemSKCNSwlMUp9YKQY6zQOfs9vgUnbzTRHCRBRdsabZYknxTI4DqQ5+JPqw8MTkDvb6nfDZGd15t4oY4tHXXoCfRrbMjJ9+DV+M7bd+vrBI8vi7DBCM59/VAjxBAuZ9P7Tsg8o8BrVqqB9c0ezlSCtFg8X0x2ET3ZBtZ49UARh/XP07I7eRk/DtSLYauxJDPzXVEZmSJCIybclox93u8F5/o8GySbD5GYMhffOJgXmul/Vz7eR0d5SxCMvJIRrP7WfiJYaUjLYqL2wjFQe/nUltcGCn2KtqGCyH7vl+Xzefea6Xjc8ebTgan2FJ0UH0mHv98lWADKuTI2fXcCAwEAAaOBqjCBpzAOBgNVHQ8BAf8EBAMCBsAwFgYDVR0lAQH/BAwwCgYIKwYBBQUHAwgwHQYDVR0OBBYEFLGwvffmoGkWbCDlUftc9DBic1cnMB8GA1UdIwQYMBaAFBLyWj7qVhy/zQas8fElyalL1BSZMD0GA1UdHwQ2MDQwMqAwoC6GLGh0dHA6Ly93d3cuc2suZWUvcmVwb3NpdG9yeS9jcmxzL2VlY2NyY2EuY3JsMA0GCSqGSIb3DQEBCwUAA4IBAQCopcU932wVPD6eed+sDBht4zt+kMPPFXv1pIX0RgbizaKvHWU4oHpRH8zcgo/gpotRLlLhZbHtu94pLFN6enpiyHNwevkmUyvrBWylONR1Yhwb4dLS8pBGGFR6eRdhGzoKAUF4B4dIoXOj4p26q1yYULF5ZkZHxhQFNi5uxak9tgCFlGtzXumjL5jBmtWeDTGE4YSa34pzDXjz8VAjPJ9sVuOmK2E0gyWxUTLXF9YevrWzRLzVFqw+qewBV2I4of/6miZOOT2wlA/meL7zr3hnfo7KSJQmMNUjZ6lh6RBIVvYI0t+A/fpTKiZfviz/Xn2e4PC6i57wmH5EgOOav0UK</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>C=EE, O=AS Sertifitseerimiskeskus, OU=TSA, CN=SK TIMESTAMPING AUTHORITY</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2014-09-16T08:40:38Z</StatusStartingTime> -+ <ServiceSupplyPoints> -+ <ServiceSupplyPoint>http://tsa.sk.ee</ServiceSupplyPoint> -+ </ServiceSupplyPoints> -+ </ServiceInformation> -+ </TSPService> -+ </TSPServices> -+ </TrustServiceProvider> -+ <TrustServiceProvider> -+ <TSPInformation> -+ <TSPName> -+ <Name xml:lang="en">GuardTime AS</Name> -+ </TSPName> -+ <TSPTradeName> -+ <Name xml:lang="en">VATEE-101114112</Name> -+ <Name xml:lang="en">GuardTime AS</Name> -+ <Name xml:lang="en">Guardtime</Name> -+ </TSPTradeName> -+ <TSPAddress> -+ <PostalAddresses> -+ <PostalAddress xml:lang="en"> -+ <StreetAddress>Tammsaare tee 60</StreetAddress> -+ <Locality>Tallinn</Locality> -+ <PostalCode>11316</PostalCode> -+ <CountryName>EE</CountryName> -+ </PostalAddress> -+ </PostalAddresses> -+ <ElectronicAddress> -+ <URI xml:lang="en">mailto:info@guardtime.com </URI> -+ <URI xml:lang="en">http://www.guardtime.com</URI> -+ </ElectronicAddress> -+ </TSPAddress> -+ <TSPInformationURI> -+ <URI xml:lang="en">http://www.guardtime.com/policies/</URI> -+ <URI xml:lang="en">http://sr.riik.ee/en/registry/legal-framework.html</URI> -+ <URI xml:lang="et">http://sr.riik.ee/et/register/oigusaktid.html</URI> -+ </TSPInformationURI> -+ </TSPInformation> -+ <TSPServices> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">TSA0</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIICwDCCAagCAQEwDQYJKoZIhvcNAQELBQAwJjENMAsGA1UEAxMEVFNBMDEVMBMGA1UEChMMR3VhcmRUaW1lIEFTMB4XDTExMDQyOTA5MTUxNVoXDTEyMDUyOTA5MTUxNVowJjENMAsGA1UEAxMEVFNBMDEVMBMGA1UEChMMR3VhcmRUaW1lIEFTMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2WKqpwAceqQ1DNnsIvmj7AsSFgFR4g0U3ot8aLmIVT3cJ0rVN8PaQ4zuCIGf0xTM6mp1nQRqvtEScYkijZ9lSW44KDs4P71rC/8MYuX0NL/AwDlevmjCEkvHvqCQw7SAJ5gFkObc6FGjMcOzzVDTLc/0g9txSaFy6A2kTQYWY2a7DhqRDVBJphGhW8ir28DmH+AGRxj5I3vs6V8W/x1xy90yWunh8b/DNbS+29YKQ04phwPl0Ks59qvsgm1wPppix0xf/mp9HGC574q0zq2Ee7v4PAhu2FwY2t6Hj887KTWeVDUaRsVtwKqqDWJdmJBG/Pa96H/k9v1t5Lln8NlxHQIDAMm9MA0GCSqGSIb3DQEBCwUAA4IBAQBit30I5IzoldRcKYbWRLPrii5nNcmdLFfOVbjjfh/BcQV4G9cIaNtimuaw75Kq0eVuMaD1GBzn3gNSA7UFpCURt5xtEt/TNdO4ht+SLkVuFeW7AgRSlsJ/M1LiNrQei7qkPRTYrJwT4TGFbycy6oQVkHsFx0WSntG1TECDxNfutS4oKJQVp9pCwt99CVpt2M1sniIRFIsCgeYgwP6EqB0fwHpAZGZeX42VMmvLUFdkuijBgW8phGP5yxDWGWHkY/l+XDTZB2SlBbYcgDpQuS1k0lhGRZScIDSUr4g2ig1LBrbPlMakNXg/EWh74KkDeDDE8NSZFnh/cr2azvcXqt1G</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>O=GuardTime AS, CN=TSA0</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2011-04-29T12:15:15Z</StatusStartingTime> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">TSA1</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIICwDCCAagCAQEwDQYJKoZIhvcNAQELBQAwJjENMAsGA1UEAxMEVFNBMTEVMBMGA1UEChMMR3VhcmRUaW1lIEFTMB4XDTExMDQyOTExMDMzOFoXDTEyMDUyOTExMDMzOFowJjENMAsGA1UEAxMEVFNBMTEVMBMGA1UEChMMR3VhcmRUaW1lIEFTMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3IeYUjkf9LPKTkMUrjeOofT57NjJd+5WUmrsTRDGJsW6CWN/rM405B4EbXdrxeKR5TXqvTc8uKB8vb7QdQTBYAEiy8y49jL0wApQ40B2wnAj7kpyeWHwvMLwqeVyAxFxcR+gytsUxdRXl601g7GvwlXpCqi8Alj4vKykx99SBgsrya0CnR63v+Rgwv+0tc3A24b5SiE395Dzh1R9N1pgXWYNOPqn98A1cYWGA0bwayHzpcqw+e4YcR6qQ1gykULsPNlnIGCkakiOshblezzB1WrSziT6lNAjNSev+M7Uo4j6bCB3sFRrv1NXJWM7AqLxn+zC1xVqihB+N9m0YmNkjQIDAPHnMA0GCSqGSIb3DQEBCwUAA4IBAQDUXshmA1Kx+fPyMrbQkOim5FrSoTuLw4Jaxhhcw5wQLTnI0H25IwciqGisi7ou4fYffaQISbLfbXEpGG2aaZ9DPGGeG//5NPvtLoxLYw3igmaCYi4QEQ+O8Q5bH/YgxJWIZha8qtDXYjBVq7giX+1Kkb4O87BcBm9yGWXnDbu/Cbjvv+lnbhLff3N9AGlhEVZW4y/WNgd4RjRANYuKHLsNdBBT2jnxTirGzHRbcQ3QwxJUcTO+z8f/WUJfq6b/VayReUnWrrmYG6btzU2iwUUusb+eZ2uvNNAjuIJS+ngc8g9FLlty5ZcTR+SadzU1H36mdCE1uGHVDl3L07SlHNja</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>O=GuardTime AS, CN=TSA1</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2011-04-29T14:03:38Z</StatusStartingTime> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">TSA1</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIICwDCCAagCAQEwDQYJKoZIhvcNAQELBQAwJjENMAsGA1UEAxMEVFNBMTEVMBMGA1UEChMMR3VhcmRUaW1lIEFTMB4XDTEwMDQwOTA5MzMzNFoXDTExMDUwOTA5MzMzNFowJjENMAsGA1UEAxMEVFNBMTEVMBMGA1UEChMMR3VhcmRUaW1lIEFTMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx77CtLsrKHF3SswUv5uBEilPF3hJS6J+W54dKIFj4fE0xkxl7J7yMlDMf3Gk2tunTpZolsOKDPCbsl/9SsV8dY7y+yCT7bRT467yfi2zqTrFybHjXduYGSlvagNpYVw260he6gVH27D/IdpQv2eWOOScGAWcBOZTr6pZxEuX7b24luq7sSci8hv4ARpJamWBTLQX6sdxfiPhjnyMIacEGOQuEQgUjPKxAxo45ApwSHWESD7lAm2PQNacSZJg8+pkxrOq0s/7FrsgfJzQxlDhyF9BA7u28ilsCL60WdVbxqshmQBp91yyuX3ZHAkJ8Wp0kT8EwVfVnLutFWxzXp/4gwIDAOHjMA0GCSqGSIb3DQEBCwUAA4IBAQAAYwPUlEPIzB88xdz9WTaC8/QNF/DbfYOYKOD5439rGPhWjJ0YBe6SliohQf3lK0tfBrnaCj+Nw8EwzJ7fUD6+9xJ4FLSSQPSsH3pxZliAdiLXKWXUNou6jiPTh9gSDBkkjHvWCMhHj7GNDdIEABbwfqsSlejzNsQZGUVu9Z7vP0+flTGvqC3qIJqschhpQWZqaD4YR73K06H+JEFn6vnGQ6UVsWM/KDaktvLStQui/OwIqK8kyEm2cpCQOdkVPJZ7vTcGDgonWvbwaxf78xPJUqHSNkuWIHveV6dFlS949v1eJYEwvcsv6DyVD6UI8A2efjnQmjA4KbXucmWzm0KY</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>O=GuardTime AS, CN=TSA1</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2010-04-09T12:33:34Z</StatusStartingTime> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">TSA2</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIICwDCCAagCAQEwDQYJKoZIhvcNAQELBQAwJjENMAsGA1UEAxMEVFNBMjEVMBMGA1UEChMMR3VhcmRUaW1lIEFTMB4XDTEwMDQxMjA3NTIyOVoXDTExMDUxMjA3NTIyOVowJjENMAsGA1UEAxMEVFNBMjEVMBMGA1UEChMMR3VhcmRUaW1lIEFTMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAp430lCKJvdyzzdK95iX4IlSE3MyVDkiPcQWKdvM/O0K/skXMKxK9308G01VVPz4Q0Fe/zm9Hd/b0tF6lNehGpi+CUfS13eq32JZvfyI7UsGNZCiU0nnkuGUUfLCXqlEMVsqfxXu9RAhwaJE3Zw0GZLc4jSF9xJy1HRSSryUkgp09pOl/PP5l0IgBeUESM0U3ALPvS5xjgMpYJAOshZCIS+rsyO1Cp83ymVNyGAw2jUCgjHGHu/l+wbTw8b6C2pUnqcUacaemjctKhtf6hNs+5+uTPBW2q9oA8k2c0SQii7+V04H8L8rvSdLaeVuNDgjEjzqPIJV7oS62APrWlWOf3wIDAKlzMA0GCSqGSIb3DQEBCwUAA4IBAQCCHTCmS6YOLlnhSEMpOq6F6ZUPq7B4BIEVJPlZOkrPuGRnwXY3CP1CM01mM2FcNc7OMYwEVyJNt11Aj12kB2yoCGCqABdYij78P2n4MzQykakymH/IQhTiP6rZ1glB1stye5yboAvezm5Cor9IbdGSf9QEv7DPGYqqyEwDAqCIhIgyKWBDTixcKkRFlP7hvDWCzYaDaCzaxcxN0Cjv0KTMoTDzK97IZJ2+qrBcgP/9AEsZIfPOlvzObbrRpnmwowwgNvYT3p3il7irrIwHryQh8H1kU4AwxmHtuMDcVKvQQrxpCQuEITPlBlelY2MdXKRoCcu4q//X5lq9YYP1XIjH</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>O=GuardTime AS, CN=TSA2</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2010-04-12T10:52:29Z</StatusStartingTime> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">TSA1</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIICwDCCAagCAQEwDQYJKoZIhvcNAQELBQAwJjENMAsGA1UEAxMEVFNBMTEVMBMGA1UEChMMR3VhcmRUaW1lIEFTMB4XDTEyMDUwMzA4NDEwM1oXDTEzMDYwMzA4NDEwM1owJjENMAsGA1UEAxMEVFNBMTEVMBMGA1UEChMMR3VhcmRUaW1lIEFTMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0AjnC81sjs87Vv9e8XDGWcKaj7kJTxuaeWpC+WULglfyU2YSawqwb1PZbM9AT0Oi4Dz44tCG1o0Kcaeik+vWFe7AU3GSSC9K4Y3+jrhKZEOhySn1yI1DMdnl+Iv844R/IqS+XEKvP0c2LLnT0Bnmz6l8GIUh2c9MJWXIXfNyfgymldyT3ssw/RabL/IksTdqMsa9B7ar81vtmEG2rzsUjCl6I8U6N7Etv3hseALX/mcdWplpWn8uxAGUl8KqskF1itQ04BOU3P6Qk0WsLFBNCeQ2Rj+HcHPEdxtkT1eM0IbmOT71FuS7YZjC5fqza+CoiSPKBMJioU+28KG1qOFC1QIDAOwjMA0GCSqGSIb3DQEBCwUAA4IBAQBftgbUf5jzWS5EwcLmi7OgQ4ejPme6ZO5M+SX4OJh8cTViXOpqrF6JmIaFl7auqTKa4KNtgWmeGzjaqD3U9WamJ2aU3xmtf+t9rHWns9dBE+JRVdwNIjvOyEt+foSCENaFxtPRDqpaphx/fYC+jdCdNh+JHuKxqf1tW9ktBFNxG7qxmSeBa4eC+RosAXtt0gbmHBVMOQJOApGKIlQzruJ3c5YrCRzza/+D9jSkyp196VO+aYmt2epLMTK5CvJlgIjvF/vyuJuEXAnqd1Si6qUbfLxchWHgJ/dxUf7DxeqpPzJ8s+V0CD0fXYTIHa3p9Kz7/gLqpZMcuY8OH0nVnYOn</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>O=GuardTime AS, CN=TSA1</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2012-05-28T07:45:00Z</StatusStartingTime> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">TSA2</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIICwDCCAagCAQEwDQYJKoZIhvcNAQELBQAwJjENMAsGA1UEAxMEVFNBMjEVMBMGA1UEChMMR3VhcmRUaW1lIEFTMB4XDTEyMDUwMjEyMTM1M1oXDTEzMDYwMjEyMTM1M1owJjENMAsGA1UEAxMEVFNBMjEVMBMGA1UEChMMR3VhcmRUaW1lIEFTMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuWgbOYOThEhCRi61lnP3GSdD+V4sjuQCehCt9MJ+yyFvrEcJewvGhMaCBq7mUJul0yV5pCNoSH7gLDaO8XByJ4acmV8DxKAH1KlLSH/tashAjxQLMbReolA9c/qKiwO1oK12z5OCN7rA9C7PBO8gk/sCLFacOwgYtDCz7faY5l94AEaniIA62hT3PZ7Sd0IkcL5Gp9goJ2tZdQ+G58GBZawF+pfS2dzWSkKxWiV/lMzZahRdaXUF7vCGsXDsVHqS3AhL7ZblGCRVX0Thg+RCyRBqE12iPea8HWcVMxSJFHLhvSvKHTpj3iA6WVIOCJGUlhcz7h373WCKtgwGx7U+tQIDAMRFMA0GCSqGSIb3DQEBCwUAA4IBAQC4F/SnPubK6gaCyw5/7+sMTMILecuEGZ3W3ScAWLY4KP04pS7ViqlJxCvH3brl52dc9gUG0h602hRlEhdcXpk96tcd108er0mv666mGp97CT92vIL2E46mnz6QUG8uWyNfs+7K5SCgfkAflU7+lypM0NjOLXfDgCDRK2x3S7EAJh1mlqYSRHL9mst1sBLxjUMzi2xzOEGh5SaijIb0xelm2bp2J3JZrCvyjvGGA+95xRwHrGL9sMFdksrY6u66gG9zea8qurkSzRYBv0OGNUHwQWpw95QPZ47IITq9ipqC+J67FIEZheHTUtgPfvx1ch19IS8GiSM72M6rAeS8Kq19</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>O=GuardTime AS, CN=TSA2</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2012-05-28T07:45:00Z</StatusStartingTime> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">TSA1</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIICwDCCAagCAQEwDQYJKoZIhvcNAQELBQAwJjENMAsGA1UEAxMEVFNBMTEVMBMGA1UEChMMR3VhcmRUaW1lIEFTMB4XDTEyMTAxOTE3MzE0M1oXDTEzMTAxOTE3MzE0M1owJjENMAsGA1UEAxMEVFNBMTEVMBMGA1UEChMMR3VhcmRUaW1lIEFTMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+OA6jsb8QE/mLd3RPZFW40+l9RiGhpVWtaPSNgJAu1emrld4SFmLpOWM5BPsK6tVj2waLNucmEuRtG3r6H91E7EEgjsiBDxJaaREHytXMgpatMkt26X6Cg73Eb0pvD+5eBIh6VpksIWHtRrtq6ahde2wpb9CUmF8nb9IjfJqEsd3L9+EfsF4/EppRzOs4GDzKG+NGmBz95IEMGiIf0yh9Ot05b0Wj4xdOT7sJONbF0lC5qpQiPoXMKeLzsWWj6RfctjjhJZ9s2xEyLfwM89Yb4/vdwVVaa9Rk36ZkCvuoJeP1e+FKDXAJmNRGp2knEC1lQBZvXLG027bKmDdU0+WGwIDAKKPMA0GCSqGSIb3DQEBCwUAA4IBAQCR63M7Z45TV0MW2eA1bYO1vmRSryLbBK7fC4+2T8BqCXC8PYVxRtdMrQMdLUvXolibDY8bUDIC3GI4LLMDu1ivVcAcRJOCO4ii5KHxmK+mlmInif8v7YTZIlXAqPxbxJlYmpRNaEHFcDS7fciYzvohPzpbxRCKb4Nu9rfA0YqJv2s0vZmkZPTQ7W1vwHQw/+7KeRL3v/oY6/ANP0eKcNURwdhV3es2kya3RyEXH6sJuv3iUGOIPTAp5h8T7RV0xjlDxnz6BcRMSxxpFhyaUJHaA8ELKQXqHx1jjz0Ycri/AdIM21F3wc5Uq6855rm1STGythhxYFkrgx/dgLU7JeXc</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>O=GuardTime AS, CN=TSA1</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2012-10-19T16:31:00Z</StatusStartingTime> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">TSA2</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIICwDCCAagCAQEwDQYJKoZIhvcNAQEFBQAwJjENMAsGA1UEAxMEVFNBMjEVMBMGA1UEChMMR3VhcmRUaW1lIEFTMB4XDTEzMDUxNTEyNDA1MVoXDTE0MDUxNTEyNDA1MVowJjENMAsGA1UEAxMEVFNBMjEVMBMGA1UEChMMR3VhcmRUaW1lIEFTMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmbkBqCyj5DTDvCRFqy9AubKiWtz1NczYGFG4Uu1YrtNpY7hOrutp2SxjBZGMwcXDXdzIceE28FCvuPjhTF1MsSmWA3wRqEFfdoKtwJ3hYM4N8NKB8GHgDKRYKw5nY++1anjt+KoxhpZsRbaAvPZSkbONr6trgSe9DUXE1WJ632LAvC0PGdd4LnUERxnernnhs5N/mQwv4BJmMPHcZ2lpiMfBCgJ2/v7r9UbodVRkGr/EHMzp9RdehneT3IQpMDV+7oL1niOyXi6KVdlbqaLzmL8QTpQuopfhaA6uKaAegWkkEaYOo50BK3xYKZjCUHwL+yH6Sw7ddgGNtBId7vtdpwIDALyRMA0GCSqGSIb3DQEBBQUAA4IBAQAjlFih75+4WvKgcTr7CHVgftiGLaSCa93uq57kmebap1raFqigOkCYpqg3Jx5DDhdGcx93VjdqTt6qC8IAvx2VJAywQXOisTtIrfiXK5hXUJMWlXzqT6q6Kv1q3Ac8603QySfStmVg5vehW504bg2UnjjL2oY0+X9e/D8nQRpeI8zVNAYYk2elAr3nNDrcR/kRtEfughvlK2F4fS5R4UrNO2P7xTaiNdQwRuq3CJZEkA2HjPRXE3kiJoL80p7aWU6DKOOHZr6VQjcOHJiK5T/ZUHeOT10tM3BCPHzmmHAs1ziMkFFfItOmAXooOXBsw8L3cOX5BiopaTnMzMw7Pwfo</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>O=GuardTime AS, CN=TSA2</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2013-05-15T11:40:51Z</StatusStartingTime> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">H1</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIICtjCCAZ4CAQEwDQYJKoZIhvcNAQELBQAwITELMAkGA1UEAxMCSDExEjAQBgNVBAoTCUd1YXJkdGltZTAeFw0xMjExMjYxMjI1MDhaFw0xNDEyMjYxMjI1MDhaMCExCzAJBgNVBAMTAkgxMRIwEAYDVQQKEwlHdWFyZHRpbWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6jdPpv5oA0BNHcFTVZpB8CEjGZvWix4KWgbAVbJiQaiLx2TgmRrimtAi7ogQ2qWPpJJbxgnKQUvpL/913tMH1blL2PXYk2fR6xU/jF3DoBvQBA7TrX39OlcTn+GO/noh9/hz3/a5ebyp452AyFow/g7IzvECf/kT8G+OcIj4aWK/M7qbmrj98eB/j6t5kuBF26llyLzExJr4iJOTSuCaR7BT3yWuLC3rAUtXJaG0XiQxkmTd6Ibt5GK8pSBtsQfKeJv9iTUS6I093rqZ8dSiP9/k2satrk9/hy464niGyXiKWfiEwWBeEe6okg7FwtZZ7ZHL42IATqLBRmbI9qvbXAgMBc7MwDQYJKoZIhvcNAQELBQADggEBAEbHvn6BZArTuTDE+opwN0NZ6FdtQ102tR1qWMcNGgKKICc1dvQpTCsUD5X4RL26pE0aNy9lB6HFa2vNlS4ZOz7LAbxKWn9DwSTHZVCBmDz7cThAop6YaVd+f2cYk6aP4FnIWr0dfSTTqxIWyFURip5TLC4vgu2FvJRuQU3LTBcpdbi5WwVSxxgS5VCzpEc5qUC7kZFGBV/aze6CAxUoE2nWrK3udj/8RUOSpUyaeF+f4oEAkR/xMKvd1xuWjl09rRyOD71h7WhfmNAJDHYZVRVthl6XBJbv+DMOkjpltfeFUHyvZm9eXEZnUh+KS8VpJ4O62VA+rNwV6e2QgaaVu7M=</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>O=Guardtime, CN=H1</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2012-11-26T12:25:08Z</StatusStartingTime> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">H2</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIICtjCCAZ4CAQEwDQYJKoZIhvcNAQELBQAwITELMAkGA1UEAxMCSDIxEjAQBgNVBAoTCUd1YXJkdGltZTAeFw0xMjExMjYxMjQwNDZaFw0xNDEyMjYxMjQwNDZaMCExCzAJBgNVBAMTAkgyMRIwEAYDVQQKEwlHdWFyZHRpbWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGUFzXDI8KWQj8/UcZLf1BecHHG3+YYoA3FwfZfdNjlbRepRdwypQx8p0RNbvcZC5eP7TnOLz8tCA95jBclLXOOMEKLeIdbcEuERrVNNZ6MplCsLBfxf0rSZzPcgjUA8vnREZj+rLqYkUwt6P2qt3uwCT/Ymm6D25UG373TX/058+7+8YlftspEowUPZt1E23ZzpTrObervZSiqvy4V1+efOPQZq0B/h71hkmw0+/zuWJ9vjTUhS3sde86AqDf8s3q6G1FbVEH9ilnJ8XZipam95fZx+kRCeBQ/Yitw+lYeLcGFQKOJ0uZuqMo3HnFcJfNkd27uA1Ymi938SVOCypfAgMBbiswDQYJKoZIhvcNAQELBQADggEBAHR1TVGVIuBLeTtrflzXP4bnsczEudLu36D0dTKcwTvBeGB4YEnaBp69vKT2/boNbdeZ0Pm6ft7PQYRzQg5v8NVlqmYwq8pAxNhrywGOICOynoW7mnRbooDKVQ25Ct4vdJwdf/pcrJ0l9F1WX3MZ5rNgKTPW6sXrMReXojfFf/2YwAvdwPhATjtRvnXYhkkN0aeXvkgPiPMctEP0lEiZelwWm+DjVFHOy8l1d4+38rvh25tuChxxcl/p45/H7xpAndHO1qpKEu9DJy6q5eWBcNgvHVf7UTXSDtIuRCOcS6g0Q2yz72sdW1Z/m1W/67ToYjofQwvhc14CrhQkD05pRAA=</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>O=Guardtime, CN=H2</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2012-11-26T12:40:46Z</StatusStartingTime> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">H3</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIICtjCCAZ4CAQEwDQYJKoZIhvcNAQELBQAwITELMAkGA1UEAxMCSDMxEjAQBgNVBAoTCUd1YXJkdGltZTAeFw0xMjExMjYxMzAwMTZaFw0xNDEyMjYxMzAwMTZaMCExCzAJBgNVBAMTAkgzMRIwEAYDVQQKEwlHdWFyZHRpbWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDVkmSzH2Au23FOAGkCMTdCZUoHCcOHV7EPqVxFmwea01gS0nDfAjzFUcudvgYRtaw6r6r4ZPLC+pqBI0W7FjeVpRQAuKypYGhie2IEd2FAQLDB4gnJl68Z7K9B+Njc8rvwKbrqix+N3ReqFz9IENbwtGrXj90SMFBoCofkmUCe+fy5H/YYjhud7wnZUhYPw7DsYU+5eqAh9dNXNSD4gxOLDoZgID49G953fS2pkgdZKIWpZl+/hftiTDLD92NB0HYwoqEJZZGSM+RUKMxPeRiHz6goGcqoXp/WjeXyd5uiP4TQX8KsvAQQDTBrBs8DFbFlL7MOEzM+vvV2PdFdU0bRAgMBDskwDQYJKoZIhvcNAQELBQADggEBAL/Invma9hUUj7tcZAKKNlZm2bktd6jguW+eFUbf7m1zfSLw3sq85mwFkl8hSDlV/d4pasJJCd8KmGLki5T9BM/TAjvzf1g2orBGMArhZkYNnYkuJTHcxetLFqtyBxdMKGiObmhfTI1YNAckomnvsausJ8ejsKKFxFTcWQ1TOeL3v3N/sZ/c/pwVd80ZbTIo/k/dFwbRVkhuj3Q+DDi/8tlcGXSAppBVX+uFqDGudu3TZ8XQY7VX7ZSH/2rIO5SZm0CbgAOFYQitDLKLIXEBS6R4W4n559L+dXIaStAR3U8Jmx8WXWMSsa1FJVynyiVLUMMw07mVgQGUs2IK81ghXsY=</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>O=Guardtime, CN=H3</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2012-11-26T13:00:16Z</StatusStartingTime> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">H4</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIICtjCCAZ4CAQEwDQYJKoZIhvcNAQELBQAwITELMAkGA1UEAxMCSDQxEjAQBgNVBAoTCUd1YXJkdGltZTAeFw0xMjExMjYxMzA3NDdaFw0xNDEyMjYxMzA3NDdaMCExCzAJBgNVBAMTAkg0MRIwEAYDVQQKEwlHdWFyZHRpbWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNVtvh71sZgFYcsv6a/zRU3/iby6KWNztiEjzuLl2oaqsUEVHq4kpAAj6/Hl+UPpIEwPEckB6rpGRgeN/+K+4bWJTrxh/7S/k3sQiHozTAYIOf6TIC4xAK5rjkfRyJNWZMbKU5ShXGC+DMh5sn5ZLtxOLshP4bVjCDrKUb+bNJCxYE/UT4N3bSPj3j45CgYnwqANWu2MFYcuuwSI6M+BiLWRA9HNLwHF3nVibCCJtyo17gN4oa236h61/+hehqICa9xePBBRh9gao35dtFNOEUgEN+qjqXGkUBrcFst6SG0nGh67AGJcQeku3QKU8Z81qocY9NhUKeXordC1C/XPsfAgMBWGEwDQYJKoZIhvcNAQELBQADggEBAGAdaaN8Zy/BWVBH+hLT+LXFJLKmFxaqRKRiyPtuerCRHmKjlHw8JqlVjB1UDUy4BN1LL04k6iwcpZX/ahuvlG0cwrdfi2/ld++ngyMQ8ecFEvjvli5u9kqiWSFxwDtA7fU5rsTm+Qni5hklPA60VMQHkuylx5oHejoyvPoBEft/tQnQ3QL+re7Cs06in8hkBtWndYK9jyot7G99wWfR5TEYzYQkze1L0oTjmySW/+EkrsT66XmRWHQuYLgo5tL5D+oO6H2tfeiKQ5PO0+zDLwQJJYjvvITCVKudR7/sH1v6/B4nXuvch82gaAzlfHK3EP6TQ7CBC3cw+uZ7qkggdIY=</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>O=Guardtime, CN=H4</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2012-11-26T13:07:47Z</StatusStartingTime> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">H5</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIICtjCCAZ4CAQEwDQYJKoZIhvcNAQELBQAwITELMAkGA1UEAxMCSDUxEjAQBgNVBAoTCUd1YXJkdGltZTAeFw0xMjExMjYxMjUzMjJaFw0xNDEyMjYxMjUzMjJaMCExCzAJBgNVBAMTAkg1MRIwEAYDVQQKEwlHdWFyZHRpbWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzNmmpHjZG/rb8xYUBH5TgSkSE9tkVl+JgtkeokY0BLZvrJhM9TZ/XX3AbN5aagJWnMgxPDBCyTYcA7XzsW6lRlQK7gym+zbLi9bmLEcpQzEYdeQs4Bi39Hb4vtlHYOFQjdck5H0CCaiLoJVJxX4b5y1dczJjXN5n7pkBl/YXXuIt4h/41bdZKw25j/KxEGWU/CmlZdrrDPzYW85aYk++dbO+uKspRkkIQZV+impSUpbwjOoN0VjfrmbJ7s+iyvB94j6qvvSTl537uFY6TOK//W3O4OrtEd8ze3aiePC517yTM8IQaUOrNy/pojan7FkhvLcVi1duQILuAcDu7gaQjAgMBMMcwDQYJKoZIhvcNAQELBQADggEBADndrk/PCTqGVmbrtjFWmYIjLyFgbUihSoHHf2+kw66Mzi77LFkDc+CYSz5M1pIjsXQe+a+Kkrvpc9YKkvxnT81ttiSduRujCNw2ISrYfFVP91Hzxh6hl2mnRSF6LOLsNbZCaSJjkH4JPuFdnY7wUiozKFmt/6T/5qu4B7osH5o+sLuCJKcgk0fXgssx41JM+ZUWf5JhS/QUUaPiW18s4SOZmNmO5w1IYVVG70bUOXsoGsVmrBNuuQeikPPdE30OAf+4ODB82rudUZok/ZrSW69p+eiAbkLKqlVfd1Lx05xeLf/EBgIvlSXRUECHV2LDmTbwJq1wDjHh5NHN7Z8I22I=</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>O=Guardtime, CN=H5</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2012-11-26T12:53:22Z</StatusStartingTime> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">H1</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509SubjectName>O=Guardtime,CN=H1</X509SubjectName> -+ </DigitalId> -+ <DigitalId> -+ <X509Certificate>MIICtjCCAZ4CAQEwDQYJKoZIhvcNAQELBQAwITELMAkGA1UEAxMCSDExEjAQBgNVBAoTCUd1YXJkdGltZTAeFw0xNDEyMDkwODQ1NDNaFw0xNzAxMDkwODQ1NDNaMCExCzAJBgNVBAMTAkgxMRIwEAYDVQQKEwlHdWFyZHRpbWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDLKt3SYJHx+Y0zQypj433j9k23BtR7VxLy+FDL54GkqmAiCmaknWz/nRy19FM+kDfciM92OySnneN+nOyykfoblJ0uL2CIhN5vYITV9QvHxNNsij0urOiWu5eXui6N6T+lZPOl938EmNeorJbgzG7FeDJid5W4kRBE9apiRBPp3YFehl0crycBgLY6kHlvvoH33AgwsW9Zbp2B7jWU92GdH1D3aBw5JwhEhSI01sqjcI7Odbh7PZaygsXpoVRyW1T5PzDDR1+qoWHoak/oN9J0NXMEAVyswpytQ0rckOIbnXhfA7va2WLQ8+GuIm7wKwquS2wtqgBPbyvO7rP4L/AfAgMB4EEwDQYJKoZIhvcNAQELBQADggEBAI52GHcEe75qB8Sps07G3TVA+XXh+PGFZYSMrH5bsn1uJvaDNDb1fl1dQCK+YibtoxzVM0pdyBVlHFWsex1wTpdmstsmZYP8Xaj9ezabN6nPSCz6pdzhFUKM2XG0kuny6JLAFuNjqsh13SxsATARL6yZv7L2PI5VclXHbcpRhNaqiTeTKxLfXqfTgSX1f1RGNJI/r4SoiTBT+PFJ2TcJfc5GTuRunaTeGVIe+QGIrv0fWXAlZylGTFszgq2e2hh/1i9KFlxD7gS1IPvSRrxHVWdTEjM9BHSjMd/y6L6jQ9Ti9qW+UYz2CRo8sOYgfB7axA1mVmv/W60TQr2pkCl7GDM=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2014-12-09T09:45:43Z</StatusStartingTime> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">H2</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509SubjectName>O=Guardtime,CN=H2</X509SubjectName> -+ </DigitalId> -+ <DigitalId> -+ <X509Certificate>MIICtjCCAZ4CAQEwDQYJKoZIhvcNAQELBQAwITELMAkGA1UEAxMCSDIxEjAQBgNVBAoTCUd1YXJkdGltZTAeFw0xNDEyMDMxMjIwMDZaFw0xNzAxMDMxMjIwMDZaMCExCzAJBgNVBAMTAkgyMRIwEAYDVQQKEwlHdWFyZHRpbWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8ojFnaqso7obLfS6sDn8Mj22s/ZcmY2NbwfGy12xX+1FpEjgwrwea8Uq6YS55Mvux/oRcBh2UsgFxnn0IlzSLgrmRx0t42PVuufygcXVGy+voYjxsOJUkP8uFqdv+QhLPUHTyVzMKHIYvVEa434dHKiSK2nwWkpFVqEQ2hITU/uSv3ZAX64F+7iJuIlraefdZ0QC6ucdOsxAFwC3FEH+HfPpV2rb6nhsBu8hxIGWOqDHoCcd3y0H2+7n/BE1pmOCkuT0j1tKU2NwUrEvWfRna2xyx+zNff9PmcNRrlT0yytr4ghCuQJbcGpA7+EGf5jGKfGjL1xL6GXwnb3W23SPDAgMBHWMwDQYJKoZIhvcNAQELBQADggEBALxmxs0QzRhDIlCmedBngmOGYIBd9sJ3TtWXak+4cJemPttrKPetWlDnSHyW2leuO6neIUtvKSXVETrIqbX0Y2bn37qPseBu3284qWLi2fAYhhOKfz2PEuUmck0+p3wKH6iDgsXgjmQuu6wO9m1+Y8qB/K+mSwi8gpxjBU38aPCgQrPZnIAbBPpju2NBb241ep+aOlonKQRO+KcsPMwYzLt0xEmkjopq4dRl0i+Nl/m3EVc1JCIslvSD37tUBQIbEpvv7OrXbv37xvY9Cr4JRWrrjrRO6n1d2NSxdagHjwobdBgPCQXGqroMxUNL0EprVmlbRNvWkxmj4wd6PYKfnaQ=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2014-12-03T13:20:06Z</StatusStartingTime> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">H3</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509SubjectName>O=Guardtime,CN=H3</X509SubjectName> -+ </DigitalId> -+ <DigitalId> -+ <X509Certificate>MIICtjCCAZ4CAQEwDQYJKoZIhvcNAQELBQAwITELMAkGA1UEAxMCSDMxEjAQBgNVBAoTCUd1YXJkdGltZTAeFw0xNDEyMDQwOTI4MTFaFw0xNzAxMDQwOTI4MTFaMCExCzAJBgNVBAMTAkgzMRIwEAYDVQQKEwlHdWFyZHRpbWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC15sVKLBcJ6NRMFmMZxyBy/kKCcBr8zwozbZ+3cyuKeRk8s2+9IEH0xklpE9MxCmDaW65rpk24aX01A9LvYaM/Jn8bzE9H955wuRTWZbUpW22iljLxjq3x6bM2mwMB/BRkWPK/0BZ8mO1XOXFGh6eRD5OqLXDen3AXno3LgxpibK7jHekfX1aT2G35c2zDcZmif86bQiFSxPxI/xJXiJcswX3Xl1CoEdoyiOhyYIl1756QKzNL/yzXy4W7Fczk5gjax+ke9snndPg/ZnPzKLHJowNyPzobhG0R7W7eG/S7BpxMTEG3alA3BZvV2gmVDw8Bp8t6mNNtxgbWL6fqKQdrAgMBb5cwDQYJKoZIhvcNAQELBQADggEBACyCZSs4DiVR9FvRRUCeXAU4zpvlO2+nlAqL/SnK657aHNbnnQKqtBdoW4N/Gf6Pxz27B7PB1c1p1qgmKzvVewKfwh+37XoCIxqenoLzwALGN0wPne3dVB1Jf8DMEMtECB5ktZMd/BI8fgc6VlYBDnDXa+qu13hbTHYuWV0dIokseNOoNU9twcABn14E0AsEwfalZpXps9LQgjVx609pZwDFRQo3igzY4qKxpivUD0xyrjjsh5UebldLj2K7gtFubrenuQuRerVFIJ82VmNsAdFFzyVsCXdUdULO+wxcnIjCUlAY2l8CEM70z/UXmuCCqnoqPmmXk/oEIdqPLZQqR3c=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2014-12-04T10:28:11Z</StatusStartingTime> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">H4</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509SubjectName>O=Guardtime,CN=H4</X509SubjectName> -+ </DigitalId> -+ <DigitalId> -+ <X509Certificate>MIICtjCCAZ4CAQEwDQYJKoZIhvcNAQELBQAwITELMAkGA1UEAxMCSDQxEjAQBgNVBAoTCUd1YXJkdGltZTAeFw0xNDEyMDUwOTQwMzVaFw0xNzAxMDUwOTQwMzVaMCExCzAJBgNVBAMTAkg0MRIwEAYDVQQKEwlHdWFyZHRpbWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgdoH5rbrx9r/CkW7gdHjEGtJlVYP9/sF26W0yMVvyEApwXJk9ccM5FNeJlnHO94DQ4jQIYGU8MnFu0Xs8FlrRI47vPikjsdI/HfGW8zQFvPq/CGR2JWtoTW/OS3TLlhuKsgZ4ynsIZs7VrU9H1bk/OyAgtvK3sbdyELF6JYIy0t2mN5kXHPgFYs3PCifQteLEDsYLdxKKtwnEpR8Vyptw/9iNHPsvnqwpa/U5UL0Q/0dF4fxpYNwVdgTKL5bpjaI6I2NmYBdhI8L9aTdEXsP+kSA/+pB5iqNGZ9vlrfweRLsqb8fIILjgIheJwgOKMMTdfIsxfN8nJPr6ICAjd37DAgMBmHswDQYJKoZIhvcNAQELBQADggEBAHh80N8rHNR29mMguKbYl5b6Enhls0VWx/F3oDe+gfZ3p+ASXHPqZG8+e0BwDZh0QykZ3g8etSBL4yOEUi5PEhilECuny++NqFItHheyUXFFJih5qCqP8w+qiseVignIlRH/oumNXMt0HZUeWvh0G43Nc/6OdW2g2OtjUKjQ3WtbNP9Znx+okruUAzOrWpYN0V5PqE5FXrrsslykYb6ou3xThvmkowHddyl3x/koUd1nfra5YUAY9hzfFfUC8SdRg805OSy+EwI+dE006j91dR1EyNKZhqEg1Q5Wb2BGGRXbAYDOGeuX6NE9X+V2gKqD+kauxfz+t2f6lzWEueaexo8=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2014-12-05T10:40:35Z</StatusStartingTime> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">H5</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509SubjectName>O=Guardtime,CN=H5</X509SubjectName> -+ </DigitalId> -+ <DigitalId> -+ <X509Certificate>MIICtjCCAZ4CAQEwDQYJKoZIhvcNAQELBQAwITELMAkGA1UEAxMCSDUxEjAQBgNVBAoTCUd1YXJkdGltZTAeFw0xNDEyMDgwOTAzNDdaFw0xNzAxMDgwOTAzNDdaMCExCzAJBgNVBAMTAkg1MRIwEAYDVQQKEwlHdWFyZHRpbWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC60wohNDbrmyAL/7WupGYRFg8sBizryJup1HDV/YJvhVAo7jt63nrzuxqnADeqlzeek2GuYugh5LbYRR8EeBtxE3ssIablc5TLKPZj1hzJ+Tsw39BrbYebQUwusxU+BUclQ9TpxgSAM6eXa5w2pi9o8eiHVMxzXQ5c5BE0XGSSH4IRRoej/xnealXgxNIFvEm14sFvkAg04WQQwD9ZTmWMY80WHeYDFr+v7N520r19GMyTc8YoR8DfWI0lLBYrcG1yDXu6gZlaLD+Xrb633Qn7WRgWD0ejCh9taWbEDBwoc6aM8yZDLfBsExYQSn8RMCcVXZjDZv5k7+IQaozgj0q7AgMBarkwDQYJKoZIhvcNAQELBQADggEBALnzytGvxyDEf8fDaErxIVaZpUcZrWSifiBc3jK3h3PvFTuaY98DT9keY2X1vM9mSeMBusRdMbIkFROA6+uUUNEXlp7lQEoZ9/N1H4vCGscvZWBOua668qw2PrUCQoD5pP1SDH/0JpK4wX+Xk8bdi+Q6cHu2p606r4PBtJVv2oR5y+LaghTC10pT+4+EQ8rDPmseiatvSa9dJdz3RM/bIR+Ki9OO5nBYpPBQJuvDTJ1rfWSfr7JD0ejDOVeG9OfN0j26L/sChV5uZxRMs/mvIlRibHqXU0+oeOGCCsZGb6YN27nLFh5TUdqtGRbJuu3f/8tYNLa7Gb/iI6afpO8nRXc=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2014-12-08T10:03:47Z</StatusStartingTime> -+ </ServiceInformation> -+ </TSPService> -+ </TSPServices> -+ </TrustServiceProvider> -+ </TrustServiceProviderList> -+<ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#" Id="id-f7685ea087cbe6b4462ba71954a2a9a3"><ds:SignedInfo><ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/><ds:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/><ds:Reference Id="xml_ref_id" Type="" URI=""><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/><ds:DigestValue>j+9gYt6p5wepZ2D+v4UMpi2ngnyACS2Xw7Mdl/UldVg=</ds:DigestValue></ds:Reference><ds:Reference Type="http://uri.etsi.org/01903#SignedProperties" URI="#xades-id-f7685ea087cbe6b4462ba71954a2a9a3"><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/><ds:DigestValue>h/24vkRG/BCBuEIS+6inHtgAurioFNbkO2EkycN9uEQ=</ds:DigestValue></ds:Reference></ds:SignedInfo><ds:SignatureValue Id="value-id-f7685ea087cbe6b4462ba71954a2a9a3">XYUUi+Ch9gcfrz0DfsifdcB6IDBCFicSO3ww2e8ssGy91XzQLuKfwC77ROHl6oApuPxYYeUkXUXZ15Im/kq6GjYcqrQJ0ZLoHpaxTgx2ztLwPAA4McdXNt1QoNSr5EBUxlk8sYkKh142PZWZ4kAxDyAfDlE0jnhUvGRekbUEoX/00BLCmX+KhTPcTIoj/OEhLMTwJPNPbryXpOrlxFF8NyAXX7o5tOu1mV6/ntyTpHte+AbXdL7DT2Aaj9htGS99fL0jPBAVRUkTdSB02u0xRP3t38nY6qDMV8FESfkJcWXmWjrc/qBCxaJEx1QvfoKESlp/2Un2FppsoEqs/FB4Tg==</ds:SignatureValue><ds:KeyInfo><ds:X509Data><ds:X509Certificate>MIIDtDCCApygAwIBAgIJAOGr7PilHGMwMA0GCSqGSIb3DQEBBQUAMHExLjAsBgNVBAMTJUVzdG9uaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IxCzAJBgNVBAYTAkVFMTIwMAYDVQQKEylFc3RvbmlhbiBUZWNobmljYWwgU3VydmVpbGxhbmNlIEF1dGhvcml0eTAeFw0xMDEwMjkxMzIyNTBaFw0yMDExMDUxMzIyNTBaMHExLjAsBgNVBAMTJUVzdG9uaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IxCzAJBgNVBAYTAkVFMTIwMAYDVQQKEylFc3RvbmlhbiBUZWNobmljYWwgU3VydmVpbGxhbmNlIEF1dGhvcml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALhdQ9c33Y98JC0pl34+rg+qXLgdjEQaBM9gpxOpIpeqwrcXi5xbLmh4mk6imennbRaZXgJRqrOkx77B+UsBwn6uPgeZenJ1kFGvAOR9aePbgxJ5AggMr4wJXSa03OSGDhptsmMFc86qtnht94mDf1UCn1CNYA7qQHzu4MQwqJ2Ist7IIki89VZD5I4Y5AItMKlEjnHAOw/dlMfI8SxE2vvxCIyQu+rhfGPfwotHi0POyKtkX9Y+JSqEVqRXNw7B2x+d9mRYUJ8EqDvj5ag9dtgyXLsfJ4HdUJMqvoT6QnfwlBbaFusTm3R8SNVXl/8LHDoM5naOSKAOGRSe2OnxAJ8CAwEAAaNPME0wDAYDVR0TBAUwAwIBADALBgNVHQ8EBAMCB4AwHQYDVR0OBBYEFAon+QooAKxPsgZlsTxvK/8synsxMBEGA1UdJQQKMAgGBgQAkTcDADANBgkqhkiG9w0BAQUFAAOCAQEACansBzvd2iwBlZg50oueEtUlFyE+do+FmI4apydq2bM3kdeikWGERSbV1EzD86j7jpNKEOvlPTkV7fZl+7uCJ3OuCrzHEzuaZnvFPkN7Rmj4P1AGh5UK4UVWJwTceuhzIf4D6+/5CNY6U8iEHIqvAmTVOPSKEvxdBv7GKHy6x897icQa8ttHq+xCLmc0+6zpbzSZ5dOmFG3kzJuZPqtqa89Lqf7x6IRRKgUd+C+JsKDMjEde/eYnM8yxdVlzEWe6Z0qKVvPTuiCnhTNhaaQM3aiw61RMTes2Ik4wSGY75XZjQV5gVszHJBEntktcduGWCuJ24qS2lb1M2/8bE43Fkg==</ds:X509Certificate></ds:X509Data></ds:KeyInfo><ds:Object><xades:QualifyingProperties xmlns:xades="http://uri.etsi.org/01903/v1.3.2#" Target="#id-f7685ea087cbe6b4462ba71954a2a9a3"><xades:SignedProperties Id="xades-id-f7685ea087cbe6b4462ba71954a2a9a3"><xades:SignedSignatureProperties><xades:SigningTime>2016-01-13T11:30:12Z</xades:SigningTime><xades:SigningCertificate><xades:Cert><xades:CertDigest><ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><ds:DigestValue>FLND/PjEXrla9sSFb5Npn5rUqkw=</ds:DigestValue></xades:CertDigest><xades:IssuerSerial><ds:X509IssuerName>O=Estonian Technical Surveillance Authority,C=EE,CN=Estonian Trusted List Scheme Operator</ds:X509IssuerName><ds:X509SerialNumber>16261351432217453360</ds:X509SerialNumber></xades:IssuerSerial></xades:Cert></xades:SigningCertificate></xades:SignedSignatureProperties><xades:SignedDataObjectProperties><xades:DataObjectFormat ObjectReference="#xml_ref_id"><xades:MimeType>text/xml</xades:MimeType></xades:DataObjectFormat></xades:SignedDataObjectProperties></xades:SignedProperties></xades:QualifyingProperties></ds:Object></ds:Signature></TrustServiceStatusList> -\ No newline at end of file -diff -ruN a/client/tl-mp.xml b/client/tl-mp.xml ---- a/client/tl-mp.xml 1970-01-01 03:00:00.000000000 +0300 -+++ b/client/tl-mp.xml 2016-04-27 10:17:23.977818782 +0300 -@@ -0,0 +1,2000 @@ -+<?xml version="1.0" encoding="UTF-8"?> -+<TrustServiceStatusList Id="ID0001" TSLTag="http://uri.etsi.org/19612/TSLTag" xmlns="http://uri.etsi.org/02231/v2#" xmlns:ns3="http://uri.etsi.org/02231/v2/additionaltypes#"> -+ <SchemeInformation> -+ <TSLVersionIdentifier>4</TSLVersionIdentifier> -+ <TSLSequenceNumber>134</TSLSequenceNumber> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUlistofthelists</TSLType> -+ <SchemeOperatorName> -+ <Name xml:lang="en">European Commission</Name> -+ <Name xml:lang="bg">Европейска комисия</Name> -+ <Name xml:lang="es">Comisión Europea</Name> -+ <Name xml:lang="cs">Evropská komise</Name> -+ <Name xml:lang="da">Europa-Kommissionen</Name> -+ <Name xml:lang="de">Europäische Kommission</Name> -+ <Name xml:lang="et">Euroopa Komisjon</Name> -+ <Name xml:lang="el">Ευρωπαϊκή Επιτροπή</Name> -+ <Name xml:lang="fr">Commission européenne</Name> -+ <Name xml:lang="it">Commissione europea</Name> -+ <Name xml:lang="lv">Eiropas Komisija</Name> -+ <Name xml:lang="lt">Europos Komisija</Name> -+ <Name xml:lang="hu">Európai Bizottság</Name> -+ <Name xml:lang="mt">Il-Kummissjoni Ewropea</Name> -+ <Name xml:lang="nl">Europese Commissie</Name> -+ <Name xml:lang="pl">Komisja Europejska</Name> -+ <Name xml:lang="pt">Comissão Europeia</Name> -+ <Name xml:lang="ro">Comisia Europeană</Name> -+ <Name xml:lang="sk">Európska komisia</Name> -+ <Name xml:lang="sl">Evropska komisija</Name> -+ <Name xml:lang="fi">Euroopan komissio</Name> -+ <Name xml:lang="sv">Europeiska kommissionen</Name> -+ </SchemeOperatorName> -+ <SchemeOperatorAddress> -+ <PostalAddresses> -+ <PostalAddress xml:lang="fr"> -+ <StreetAddress>Rue de la Loi 200</StreetAddress> -+ <Locality>Bruxelles</Locality> -+ <PostalCode>1049</PostalCode> -+ <CountryName>BE</CountryName> -+ </PostalAddress> -+ <PostalAddress xml:lang="nl"> -+ <StreetAddress>Wetstraat 200</StreetAddress> -+ <Locality>Brussel</Locality> -+ <PostalCode>1049</PostalCode> -+ <CountryName>BE</CountryName> -+ </PostalAddress> -+ <PostalAddress xml:lang="en"> -+ <StreetAddress>Rue de la Loi/Wetstraat 200</StreetAddress> -+ <Locality>Brussels</Locality> -+ <PostalCode>1049</PostalCode> -+ <CountryName>BE</CountryName> -+ </PostalAddress> -+ </PostalAddresses> -+ <ElectronicAddress> -+ <URI xml:lang="en">mailto:EC-TL-Service@ec.europa.eu</URI> -+ <URI xml:lang="en">https://ec.europa.eu/digital-agenda/en/eu-trusted-lists-certification-service-providers</URI> -+ </ElectronicAddress> -+ </SchemeOperatorAddress> -+ <SchemeName> -+ <Name xml:lang="en">EU:Supervision/Accreditation Status List of certification services from Certification Service Providers, which are supervised/accredited by the referenced Scheme Operator’s Member State for compliance with the relevant provisions laid down in Directive 1999/93/EC of the European Parliament and of the Council of 13 December 1999 on a Community framework for electronic signatures.</Name> -+ <Name xml:lang="bg">EU:Списък, съдържащ в съответствие с член 2, параграф 4 от Решение 2009/767/ЕО на Комисията от 16 октомври 2009 г. за определяне на мерки, улесняващи прилагането на процедури с помощта на електронни средства чрез единични звена за контакт в съответствие с Директива 2006/123/ЕО на Европейския парламент и на Съвета относно услугите на вътрешния пазар, изменено с Решение 2010/425/ЕС на Комисията и Решение 2013/662/ЕС за изпълнение на Комисията, информацията, съобщена от държавите членки съгласно член 2, параграф 3 от Решение 2009/767/ЕО на Комисията.</Name> -+ <Name xml:lang="es">EU:De conformidad con el artículo 2, apartado 4, de la Decisión 2009/767/CE de la Comisión, de 16 de octubre de 2009, por la que se adoptan medidas que facilitan el uso de procedimientos por vía electrónica a través de las «ventanillas únicas» con arreglo a la Directiva 2006/123/CE del Parlamento Europeo y del Consejo relativa a los servicios en el mercado interior, modificada por la Decisión 2010/425/UE de la Comisión y por la Decisión de Ejecución 2013/662/UE de la Comisión, la presente lista contiene la información proporcionada por los Estados miembros según lo previsto en el artículo 2, apartado 3, de la Decisión 2009/767/CE de la Comisión.</Name> -+ <Name xml:lang="cs">EU:Seznam zveřejněný podle čl. 2 odst. 4 rozhodnutí Komise 2009/767/ES ze dne 16. října 2009, kterým se stanovují opatření pro usnadnění užití postupů s využitím elektronických prostředků prostřednictvím „jednotných kontaktních míst“ podle směrnice Evropského parlamentu a Rady 2006/123/ES o službách na vnitřním trhu, ve znění rozhodnutí Komise 2010/425/EU a prováděcího rozhodnutí Komise 2013/662/EU, který obsahuje informace oznámené členskými státy v souladu s čl. 2 odst. 3 rozhodnutí Komise 2009/767/ES.</Name> -+ <Name xml:lang="da">EU:Listen indeholder, jf. artikel 2, stk. 4, i Kommissionens beslutning 2009/767/EF af 16. oktober 2009 om fastlæggelse af foranstaltninger, der skal lette anvendelsen af elektroniske procedurer ved hjælp af "kvikskranker" i henhold til Europa-Parlamentets og Rådets direktiv 2006/123/EF om tjenesteydelser i det indre marked, som ændret ved Kommissionens afgørelse 2010/425/EU og Kommissionens gennemførelsesafgørelse 2013/662/EU, de oplysninger, der indgives af medlemsstaterne i henhold til artikel 2, stk. 3, i Kommissionens beslutning 2009/767/EF.</Name> -+ <Name xml:lang="de">EU:Liste, die in Übereinstimmung mit Artikel 2 Absatz 4 der Entscheidung 2009/767/EG der Kommission vom 16. Oktober 2009 über Maßnahmen zur Erleichterung der Nutzung elektronischer Verfahren über „einheitliche Ansprechpartner“ gemäß der Richtlinie 2006/123/EG des Europäischen Parlaments und des Rates über Dienstleistungen im Binnenmarkt – geändert durch den Beschluss 2010/425/EU der Kommission und den Durchführungsbeschluss 2013/662/EU der Kommission – die von den Mitgliedstaaten gemäß Artikel 2 Absatz 3 der Entscheidung 2009/767/EG der Kommission übermittelten Informationen enthält:</Name> -+ <Name xml:lang="et">EU:Nimekiri kooskõlas komisjoni 16. oktoobri 2009. aasta otsuse 2009/767/EÜ (millega kehtestatakse meetmed elektrooniliste haldustoimingute kasutamise lihtsustamiseks ühtsete kontaktpunktide kaudu, mis on sätestatud Euroopa Parlamendi ja nõukogu direktiivis 2006/123/EÜ teenuste kohta siseturul; muudetud komisjoni otsusega 2010/425/EL ja komisjoni rakendusotsusega 2013/662/EL) artikli 2 lõikega 4; nimekirjas esitatakse teave, mille liikmesriigid on edastanud komisjoni otsuse 2009/767/EÜ artikli 2 lõike 3 kohaselt.</Name> -+ <Name xml:lang="el">EU:Ο παρών κατάλογος περιέχει - σύμφωνα με το άρθρο 2 παράγραφος 4 της απόφασης 2009/767/ΕΚ της Επιτροπής, της 16ης Οκτωβρίου 2009, σχετικά με τη θέσπιση μέτρων που διευκολύνουν τη χρήση διαδικασιών με ηλεκτρονικά μέσα μέσω των ενιαίων κέντρων εξυπηρέτησης βάσει της οδηγίας 2006/123/ΕΚ του Ευρωπαϊκού Κοινοβουλίου και του Συμβουλίου σχετικά με τις υπηρεσίες στην εσωτερική αγορά, όπως τροποποιήθηκε με την απόφαση 2010/425/ΕΕ της Επιτροπής και την εκτελεστική απόφαση 2013/662/ΕΕ της Επιτροπής - τις πληροφορίες που κοινοποιούνται από τα κράτη μέλη σύμφωνα με το άρθρο 2 παράγραφος 3 της απόφασης 2009/767/ΕΚ της Επιτροπής.</Name> -+ <Name xml:lang="fr">EU:Liste contenant, par application de l’article 2, paragraphe 4, de la décision 2009/767/CE de la Commission du 16 octobre 2009 établissant des mesures destinées à faciliter l’exécution de procédures par voie électronique par l’intermédiaire des «guichets uniques» conformément à la directive 2006/123/CE du Parlement européen et du Conseil relative aux services dans le marché intérieur, telle que modifiée par la décision 2010/425/UE de la Commission et la décision d'exécution 2013/662/UE de la Commission, les informations communiquées par les États membres en application de l'article 2, paragraphe 3, de la décision 2009/767/CE de la Commission.</Name> -+ <Name xml:lang="it">EU:Conformemente all'articolo 2, paragrafo 4, della decisione 2009/767/CE della Commissione, del 16 ottobre 2009, che stabilisce misure per facilitare l'uso di procedure per via elettronica mediante gli "sportelli unici" di cui alla direttiva 2006/123/CE del Parlamento europeo e del Consiglio relativa ai servizi nel mercato interno, modificata dalla decisione 2010/425/UE della Commissione e dalla decisione di esecuzione 2013/662/UE della Commissione, il presente elenco UE contiene le informazioni comunicate dagli Stati membri a norma dell'articolo 2, paragrafo 3, della decisione 2009/767/CE.</Name> -+ <Name xml:lang="lv">EU:Saraksts, kas saskaņā ar 2. panta 4. punktu Komisijas 2009. gada 16. oktobra Lēmumā 2009/767/EK par pasākumiem, lai veicinātu procedūru veikšanu elektroniski, izmantojot vienotos kontaktpunktus atbilstoši Eiropas Parlamenta un Direktīva 2006/123/EK par pakalpojumiem iekšējā tirgū, kurā grozījumi izdarīti ar Komisijas Lēmumu 2010/425/ES un Komisijas Īstenošanas Lēmumu 2013/662/ES, ietver informāciju, ko dalībvalstis paziņojušas saskaņā ar Komisijas Lēmuma 2009/767/EK 2. panta 3. punktu.</Name> -+ <Name xml:lang="lt">EU:Sąrašas, kuriame pagal 2009 m. spalio 16 d. Komisijos sprendimo 2009/767/EB, kuriuo pagal Europos Parlamento ir Tarybos direktyvą 2006/123/EB dėl paslaugų vidaus rinkoje nustatomos priemonės procedūroms, atliekamoms naudojantis elektroninėmis priemonėmis ir kontaktinių centrų paslaugomis, palengvinti, su pakeitimais, padarytais Komisijos sprendimu 2010/425/ES ir Komisijos įgyvendinimo sprendimu 2013/662/ES, 2 straipsnio 4 dalį pateikiama informacija, kurią valstybės narės pateikė pagal Komisijos sprendimo 2009/767/EB 2 straipsnio 3 dalį.</Name> -+ <Name xml:lang="hu">EU:Jegyzék, amely az eljárásoknak a belső piaci szolgáltatásokról szóló 2006/123/EK európai parlamenti és tanácsi irányelv szerinti egyablakos ügyintézési pontokon keresztül elektronikus eszközökkel történő teljesítését lehetővé tevő rendelkezések meghatározásáról szóló, a 2010/425/EU bizottsági határozattal és a 2013/662/EU bizottsági végrehajtási határozattal módosított, 2009. október 16-i 2009/767/EK bizottsági határozat 2. cikkének (4) bekezdésével összhangban tartalmazza a tagállamok által a 2009/767/EK bizottsági határozat 2. cikke (3) bekezdésének megfelelően bejelentett információkat.</Name> -+ <Name xml:lang="mt">EU:Lista li fiha, skont l-Artikolu 2(4) tad-Deċiżjoni tal-Kummissjoni 2009/767/KE tas-16 ta’ Ottubru 2009 li tistipula miżuri li jiffaċilitaw l-użu ta’ proċeduri b’mezzi elettroniċi permezz tal-punti ta’ kuntatt waħdieni skont id-Direttiva 2006/123/KE tal-Parlament Ewropew u tal-Kunsill dwar is-servizzi fis-suq intern, kif emendata mid-Deċiżjoni tal-Kummissjoni 2010/425/UE u mid-Deċiżjoni ta' Implimentazzjoni tal-Kummissjoni 2013/662/UE, l-informazzjoni notifikata mill-Istati Membri skont l-Artikolu 2(3) tad-Deċiżjoni tal-Kummissjoni 2009/767/KE.</Name> -+ <Name xml:lang="nl">EU:Lijst waarin overeenkomstig artikel 2, lid 4, van Beschikking 2009/767/EG van de Commissie van 16 oktober 2009 inzake maatregelen voor een gemakkelijker gebruik van elektronische procedures via het „één- loket” in het kader van Richtlijn 2006/123/EG van het Europees Parlement en de Raad betreffende diensten op de interne markt, zoals gewijzigd bij Besluit 2010/425/EU van de Commissie en Uitvoeringsbesluit 2013/662/EU van de Commissie, de informatie is opgenomen die door de lidstaten overeenkomstig artikel 2, lid 3, van Beschikking 2009/767/EG van de Commissie is medegedeeld.</Name> -+ <Name xml:lang="pl">EU:Wykaz zawierający, zgodnie z art. 2 ust. 4 decyzji Komisji 2009/767/WE z dnia 16 października 2009 r. ustanawiającej środki ułatwiające korzystanie z procedur realizowanych drogą elektroniczną poprzez „pojedyncze punkty kontaktowe” zgodnie z dyrektywą 2006/123/WE Parlamentu Europejskiego i Rady dotyczącą usług na rynku wewnętrznym, zmienioną decyzją Komisji 2010/425/UE i decyzją wykonawczą Komisji 2013/662/UE, informacje przekazane przez państwa członkowskie zgodnie z art. 2 ust. 3 decyzji Komisji 2009/767/WE.</Name> -+ <Name xml:lang="pt">EU:Lista contendo, em conformidade com o artigo 2.º, n.º 4, da Decisão 2009/767/CE da Comissão, de 16 de outubro de 2009, que determina medidas destinadas a facilitar a utilização de procedimentos informatizados através de «balcões únicos», nos termos da Diretiva 2006/123/CE do Parlamento Europeu e do Conselho relativa aos serviços no mercado interno, com a redação que lhe foi dada pela Decisão 2010/425/UE da Comissão e pela Decisão de Execução 2013/662/UE da Comissão, as informações notificadas pelos Estados-Membros nos termos do artigo 2.º, n.º 3, da Decisão 2009/767/CE da Comissão.</Name> -+ <Name xml:lang="ro">EU:Listă care conține, în conformitate cu articolul 2 alineatul (4) din Decizia 2009/767/CE a Comisiei din 16 octombrie 2009 de stabilire a unor măsuri de facilitare a utilizării procedurilor prin mijloace electronice prin intermediul „ghișeelor unice” în temeiul Directivei 2006/123/CE a Parlamentului European și a Consiliului privind serviciile în cadrul pieței interne, astfel cum a fost modificată prin Decizia 2010/425/UE a Comisiei și Decizia de punere în aplicare 2013/662/UE a Comisiei, informațiile notificate de statele membre în temeiul articolului 2 alineatul (3) din Decizia 2009/767/CE a Comisiei.</Name> -+ <Name xml:lang="sk">EU:Zoznam, ktorý obsahuje v súlade s článkom 2 ods. 4 rozhodnutia Komisie 2009/767/ES zo 16. októbra 2009, ktorým sa ustanovujú opatrenia na uľahčenie postupov elektronickými spôsobmi prostredníctvom „miest jednotného kontaktu“ podľa smernice Európskeho parlamentu a Rady 2006/123/ES o službách na vnútornom trhu, zmeneného rozhodnutím Komisie 2010/425/EÚ a vykonávacím rozhodnutím Komisie 2013/662/EÚ, informácie oznámené členskými štátmi podľa článku 2 ods. 3 rozhodnutia Komisie 2009/767/ES.</Name> -+ <Name xml:lang="sl">EU:Seznam, ki v skladu s členom 2(4) Odločbe Komisije 2009/767/ES z dne 16. oktobra 2009 o vzpostavitvi ukrepov za pospeševanje uporabe postopkov po elektronski poti s pomočjo enotnih kontaktnih točk po Direktivi 2006/123/ES Evropskega parlamenta in Sveta o storitvah na notranjem trgu, kakor je bila spremenjena s Sklepom Komisije 2010/425/EU in Izvedbenim sklepom Komisije 2013/662/EU, vsebuje informacije, ki jih države članice sporočijo v skladu s členom 2(3) Odločbe Komisije 2009/767/ES.</Name> -+ <Name xml:lang="fi">EU:Luettelo, joka sisältää toimenpiteistä sähköisten menettelyjen käytön edistämiseksi keskitettyjä asiointipisteitä käyttäen palveluista sisämarkkinoilla annetun Euroopan parlamentin ja neuvoston direktiivin 2006/123/EY mukaisesti 16 päivänä lokakuuta 2009 tehdyn komission päätöksen 2009/767/EY, sellaisena kuin se on muutettuna komission päätöksellä 2010/425/EU ja komission täytäntöönpanopäätöksellä 2013/662/EU, 2 artiklan 4 kohdan mukaisesti tiedot, jotka jäsenvaltiot ovat ilmoittaneet komission päätöksen 2009/767/EY 2 artiklan 3 kohdan mukaisesti:</Name> -+ <Name xml:lang="sv">EU:Förteckning som, i enlighet med artikel 2.4 i kommissionens beslut av den 16 oktober 2009 om åtgärder som underlättar användningen av förfaranden på elektronisk väg genom gemensamma kontaktpunkter i enlighet med Europaparlamentets och rådets direktiv 2006/123/EG om tjänster på den inre marknaden, ändrat genom kommissionens beslut 2010/425/EU och kommissionens genomförandebeslut 2013/662/EU, innehåller den information som medlemsstaterna lämnat i enlighet med artikel 2.3 i kommissionens beslut 2009/767/EG.</Name> -+ <Name xml:lang="hr">EU:Popis koji, u skladu s člankom 2. stavkom 4. Odluke Komisije 2009/767/EZ od 16. listopada 2009. o utvrđivanju mjera kojima se olakšava uporaba postupaka elektroničkim putem preko „jedinstvenih kontaktnih točaka” u skladu s Direktivom 2006/123/EZ Europskog parlamenta i Vijeća o uslugama na unutarnjem tržištu, kako je izmijenjena Odlukom Komisije 2010/425/EU i Provedbenom odlukom Komisije 2013/662/EU, sadržava informacije o kojima su države članice izvijestile u skladu s člankom 2. stavkom 3. Odluke Komisije 2009/767/EZ:</Name> -+ </SchemeName> -+ <SchemeInformationURI> -+ <URI xml:lang="en">http://eur-lex.europa.eu/legal-content/EN/TXT/?uri=uriserv:OJ.C_.2015.435.01.0001.01.ENG</URI> -+ <URI xml:lang="en">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#en</URI> -+ <URI xml:lang="bg">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#bg</URI> -+ <URI xml:lang="es">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#es</URI> -+ <URI xml:lang="cs">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#cs</URI> -+ <URI xml:lang="da">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#da</URI> -+ <URI xml:lang="de">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#de</URI> -+ <URI xml:lang="et">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#et</URI> -+ <URI xml:lang="el">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#el</URI> -+ <URI xml:lang="fr">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#fr</URI> -+ <URI xml:lang="it">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#it</URI> -+ <URI xml:lang="lv">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#lv</URI> -+ <URI xml:lang="lt">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#lt</URI> -+ <URI xml:lang="hu">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#hu</URI> -+ <URI xml:lang="mt">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#mt</URI> -+ <URI xml:lang="nl">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#nl</URI> -+ <URI xml:lang="pl">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#pl</URI> -+ <URI xml:lang="pt">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#pt</URI> -+ <URI xml:lang="ro">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#ro</URI> -+ <URI xml:lang="sk">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#sk</URI> -+ <URI xml:lang="sl">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#sl</URI> -+ <URI xml:lang="fi">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#fi</URI> -+ <URI xml:lang="sv">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#sv</URI> -+ </SchemeInformationURI> -+ <StatusDeterminationApproach>http://uri.etsi.org/TrstSvc/TrustedList/StatusDetn/EUlistofthelists</StatusDeterminationApproach> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUlistofthelists</URI> -+ </SchemeTypeCommunityRules> -+ <SchemeTerritory>EU</SchemeTerritory> -+ <PolicyOrLegalNotice> -+ <TSLLegalNotice xml:lang="en">In accordance with Art. 2 (4) of Commission Decision 2009/767/EC of 16 October 2009 setting out measures facilitating the use of procedures by electronic means through the ‘points of single contact’ under Directive 2006/123/EC of the European Parliament and of the Council on services in the internal market, as amended by Commission Decision 2010/425/EU and Commission Implementing Decision 2013/662/EU, the present list contains the information notified by Member States pursuant to Art. 2 (3) of Commission Decision 2009/767/EC. The European Commission maintains this website as an interoperability tool designed to facilitate the practical use of national Trusted Lists. Our goal is to keep this information timely and accurate. If errors are brought to our attention, we will try to correct them. However, the Commission accepts no responsibility or liability whatsoever with regard to the content of national Trusted Lists which lies exclusively with the Member States. It is our goal to minimize disruption caused by technical errors. However, some data or information on our site may have been created or structured in files or formats that are not error-free and we cannot guarantee that our service will not be interrupted or otherwise affected by such problems. The European Commission accepts no responsibility with regard to such problems incurred as a result of using this site or any linked external sites. This disclaimer is not intended to limit the liability of the European Commission in contravention of any requirements laid down in applicable national law nor to exclude its liability for matters which may not be excluded under that law.</TSLLegalNotice> -+ <TSLLegalNotice xml:lang="bg">Списък съгласно член 2, параграф 4 от Решение 2009/767/ЕО на Комисията от 16 октомври 2009 г. за определяне на мерки, улесняващи прилагането на процедури с помощта на електронни средства чрез „единични звена за контакт“ в съответствие с Директива 2006/123/ЕО на Европейския парламент и на Съвета относно услугите на вътрешния пазар, изменено с Решение 2010/425/ЕС на Комисията и с Решение за изпълнение 2013/662/EС на Комисията, съдържащ информацията, съобщена от държавите членки съгласно член 2, параграф 3 от Решение 2009/767/ЕО на Комисията. Европейската комисия поддържа този уебсайт като инструмент за оперативна съвместимост, чиято цел е да улесни използването на национални доверителни списъци. Наша цел е да поддържаме актуалността и точността на тази информация. Ако ни съобщите за допуснати грешки, ще се постараем да ги коригираме. Въпреки това Комисията не поема никаква отговорност по отношение на съдържанието на националните доверителни списъци, за което отговорност носят изцяло държавите-членки. Наша цел е да сведем до минимум проблемите, причинени от технически грешки. Въпреки това някои данни или информация на нашия сайт може да са създадени или структурирани във файлове или формати, податливи на грешки, и не можем да гарантираме, че нашите услуги няма да бъдат прекъснати или засегнати по друг начин от подобни проблеми. Европейската комисия не поема отговорност по отношение на такива проблеми, появили се в резултат от използването на този сайт или на други външни сайтове, свързани с него. Настоящият отказ от отговорност няма за цел да ограничава отговорността на Европейската комисия в разрез с изискванията, заложени в приложимото национално законодателство, нито да я освобождава от отговорност в области, в които това не е възможно съгласно това законодателство.</TSLLegalNotice> -+ <TSLLegalNotice xml:lang="es">De conformidad con el artículo 2, apartado 4, de la Decisión 2009/767/CE de la Comisión, de 16 de octubre de 2009, por la que se adoptan medidas que facilitan el uso de procedimientos por vía electrónica a través de las ventanillas únicas con arreglo a la Directiva 2006/123/CE del Parlamento Europeo y del Consejo relativa a los servicios en el mercado interior, modificada por la Decisión 2010/425/UE de la Comisión y la Decisión de ejecución de la Comisión 2013/662/EU de 14 de octubre de 2013, la presente lista contiene la información notificada por los Estados miembros en virtud del artículo 2, apartado 3, de la Decisión 2009/767/CE de la Comisión. Con el presente sitio Internet la Comisión Europea quiere ofrecer una herramienta de interoperabilidad que facilite el uso práctico de las listas de confianza nacionales. Nuestro objetivo es mantener esta información actualizada y precisa. Trataremos de corregir los errores que se nos señalen. No obstante, la Comisión no asume responsabilidad alguna en relación con el contenido de las listas de confianza nacionales, que son de la exclusiva incumbencia de los Estados miembros. Queremos reducir al mínimo los problemas ocasionados por errores de carácter técnico. No obstante, algunos datos o informaciones de nuestro sitio pueden haber sido creados u organizados en archivos o formatos no exentos de errores, y no podemos garantizar que nuestro servicio no se vea interrumpido o afectado de alguna otra manera. La Comisión no asume responsabilidad alguna por los problemas que puedan surgir al utilizar este sitio o sitios externos con enlaces al mismo. La presente cláusula de exención de responsabilidad no tiene por objeto limitar la responsabilidad de la Comisión de forma contraria a lo dispuesto por las normativas nacionales aplicables ni excluir su responsabilidad en los casos en los que, en virtud de dichas normativas, no pueda excluirse.</TSLLegalNotice> -+ <TSLLegalNotice xml:lang="cs">V souladu s čl. 2 odst. 4 rozhodnutí Komise 2009/767/ES ze dne 16. října 2009, kterým se stanovují opatření pro usnadnění užití postupů s využitím elektronických prostředků prostřednictvím „jednotných kontaktních míst“ podle směrnice Evropského parlamentu a Rady 2006/123/ES o službách na vnitřním trhu, ve znění rozhodnutí Komise 2010/425/EU a prováděcího rozhodnutí Komise 2013/662/EU, tento seznam obsahuje informace oznámené členskými státy podle čl. 2 odst. 3 rozhodnutí Komise 2009/767/ES. Tyto internetové stránky spravuje Evropská komise s cílem usnadnit praktické využívání důvěryhodných seznamů z jednotlivých členských států. Snažíme se poskytovat aktualizované a přesné informace. Snažíme se rovněž opravovat všechny chyby, na něž nás upozorníte. Komise však vylučuje jakoukoli odpovědnost za obsah důvěryhodných seznamů, neboť tuto odpovědnost nesou výhradně členské státy. Snažíme se vyvarovat poruch způsobených technickými chybami. Některé údaje či informace na našich internetových stránkách však mohly být vytvořeny či strukturovány do souborů či formátů, které nejsou bezchybné, a proto nemůžeme zaručit, že naše služby nebudou v důsledku takových problémů přerušeny či jinak ovlivněny. Evropská komise odmítá jakoukoli odpovědnost za problémy, které nastanou v důsledku používání těchto stránek nebo externích stránek, na něž tyto stránky odkazují. Záměrem tohoto prohlášení není omezit odpovědnost Evropské komise v případě porušení platných vnitrostátních právních předpisů ani vyloučit její odpovědnost v záležitostech, ve kterých ji podle těchto předpisů vyloučit nelze.</TSLLegalNotice> -+ <TSLLegalNotice xml:lang="da">I overensstemmelse med artikel 2, stk. 4, i Kommissionens beslutning 2009/767/EF om fastlæggelse af foranstaltninger, der skal lette anvendelsen af elektroniske procedurer ved hjælp af kvikskranker i henhold til Europa-Parlamentets og Rådets direktiv 2006/123/EF om tjenesteydelser i det indre marked, som ændret ved Kommissionens afgørelse 2010/425/EU og Kommissionens gennemførelsesforordning 2013/662/EU, indeholder denne liste de oplysninger, som medlemslandene har afgivet i henhold til artikel 2, stk. 3, i Kommissionens beslutning 2009/767/EF. Kommissionen har her på webstedet samlet information om de nationale positivlister, så det er lettere at anvende dem i praksis. Vi tilstræber, at oplysningerne er korrekte og ajourførte. Hvis vi bliver opmærksomme på fejl, søger vi at rette dem. Kommissionen påtager sig imidlertid intet ansvar for indholdet i de nationale positivlister. Ansvaret påhviler udelukkende medlemslandene. Vi tilstræber så vidt muligt at mindske forstyrrelser forårsaget af tekniske problemer. Dog kan visse data eller andre oplysninger på webstedet være blevet struktureret i filer eller formater, som ikke er fejlfrie, og vi kan ikke garantere, at vores service ikke afbrydes eller i øvrigt ikke påvirkes af den slags problemer. Kommissionen påtager sig intet ansvar for sådanne ulemper, der måtte opstå som følge af brugen af dette websted eller andre tilknyttede eksterne websteder. Hensigten med denne erklæring om ansvarsfraskrivelse er hverken at begrænse Kommissionens ansvar på en måde, der strider med eventuelle krav ifølge gældende national ret, eller at udelukke Europa-Kommissionens ansvar i tilfælde, hvor ansvar ikke kan udelukkes ifølge national ret.</TSLLegalNotice> -+ <TSLLegalNotice xml:lang="de">Diese Liste enthält die von den Mitgliedstaaten übermittelten Angaben und steht damit im Einklang mit Artikel 2 Absatz 4 der Entscheidung 2009/767/EG der Kommission vom 16. Oktober 2009 über Maßnahmen zur Erleichterung der Nutzung elektronischer Verfahren über „einheitliche Ansprechpartner“ gemäß der Richtlinie 2006/123/EG des Europäischen Parlaments und des Rates über Dienstleistungen im Binnenmarkt – geändert durch die Entscheidung der Kommission Nr. 2010/425/EU und dem Durchführungsbeschluss der Kommission Nr. 2013/662/EU – in Übereinstimmung mit Artikel 2 Absatz 3 der Entscheidung der Kommission Nr. 2009/767/EG. Diese Website der Europäischen Kommission ist als Schnittstelle gedacht, die die Verwendung nationaler vertrauenswürdiger Listen in der Praxis vereinfachen soll. Wir sind bestrebt, die einschlägigen Informationen inhaltlich richtig und rechtzeitig bereitzustellen. Wir bemühen uns, Irrtümer zu berichtigen, die uns zur Kenntnis gebracht werden. Die Kommission übernimmt jedoch keine Verantwortung oder Haftung für den Inhalt der nationalen vertrauenswürdigen Listen, für die ausschließlich die Mitgliedstaaten zuständig sind. Wir arbeiten darauf hin, technisch bedingte Störungen auf ein Mindestmaß zu reduzieren. Dennoch kann es vorkommen, dass Daten oder Informationen auf unserer Website in fehlerhaften Dateien oder Formaten vorliegen. Wir können also nicht garantieren, dass der Arbeitsablauf durch derartige Probleme nicht gestört oder anderweitig beeinträchtigt wird. Die Europäische Kommission übernimmt für derartige Störungen beim Besuch dieser Website oder damit verbundener externer Sites keine Verantwortung. Mit der vorliegenden Haftungsausschlussklausel soll die Haftung der Europäischen Kommission bei Nichteinhaltung der einschlägigen nationalen Rechtsvorschriften weder eingeschränkt noch in Fällen ausgeschlossen werden, in denen ein Ausschluss nach diesen Rechtsvorschriften nicht möglich ist.</TSLLegalNotice> -+ <TSLLegalNotice xml:lang="et">Vastavalt komisjoni 16. oktoobri 2009. aasta otsuse 2009/767/EÜ (millega kehtestatakse meetmed elektrooniliste haldustoimingute kasutamise lihtsustamiseks ühtsete kontaktpunktide kaudu, mis on sätestatud Euroopa Parlamendi ja nõukogu direktiivis 2006/123/EÜ teenuste kohta siseturul ning mida on muudetud komisjoni otsusega 2010/425/EL ja komisjoni rakendusotsusega 2013/662/EL) artikli 2 lõikele 4 sisaldab käesolev loetelu liikmesriikide vastavalt komisjoni otsuse 2009/767/EÜ artikli 2 lõikele 3 esitatud teavet. Euroopa Komisjon haldab asjaomast veebisaiti koostalitlusvõime vahendina, mis hõlbustab liikmesriikide usaldusnimekirjade praktilist kasutamist. Eesmärk on pakkuda õigeaegset ja täpset teavet. Märgatud vigu püüame parandada. Samas ei võta komisjon endale vastutust ega mingeid kohustusi liikmesriikide usaldusnimekirjade sisu suhtes, mille eest vastutavad üksnes liikmesriigid ise. Meie eesmärk on vähendada tehniliste vigade tõttu tekkinud häireid. Osa veebisaidil olevatest andmetest või teabest võib aga olla loodud või paigutatud vigastesse failidesse või vormingutesse ning seega ei saa me tagada, et sellised probleemid meie teenust ei häiri või muul moel ei mõjuta. Euroopa Komisjon ei võta endale vastutust seoses kõnealuste probleemidega, mis tulenevad käesoleva veebisaidi või seonduvate välissaitide kasutamisest. Käesoleva vastutamatusesätte eesmärk ei ole Euroopa Komisjoni vastutuse piiramine, mis oleks vastuolus kohaldatavas liikmesriigi õigusaktis sätestatud nõuetega ega komisjoni vastutuse kõrvaldamine küsimustes, mida ei tohi asjaomase õigusakti alusel kõrvale jätta.</TSLLegalNotice> -+ <TSLLegalNotice xml:lang="el">Σύμφωνα με το άρθρο 2 παράγραφος 4 της απόφασης 2009/767/EΚ της Επιτροπής, της 16ης Οκτωβρίου 2009, σχετικά με τη θέσπιση μέτρων που διευκολύνουν τη χρήση διαδικασιών με ηλεκτρονικά μέσα μέσω των «ενιαίων κέντρων εξυπηρέτησης» βάσει της οδηγίας 2006/123/EΚ του Ευρωπαϊκού Κοινοβουλίου και του Συμβουλίου σχετικά με τις υπηρεσίες στην εσωτερική αγορά, όπως τροποποιήθηκε με τη απόφαση 2010/425/EΕ της Επιτροπής και την εκτελεστική απόφαση 2013/662/ΕΕ της Επιτροπής, ο παρών κατάλογος περιέχει τις πληροφορίες που γνωστοποιούν τα κράτη μέλη σύμφωνα με το άρθρο 2 παράγραφος 3 της απόφασης 2009/767/EΚ της Επιτροπής. Ο δικτυακός αυτός τόπος της Ευρωπαϊκής Επιτροπής είναι ένα διαλειτουργικό εργαλείο σχεδιασμένο για να διευκολύνει τη χρήση των εθνικών καταλόγων εμπίστευσης.. Στόχος μας είναι να παρέχουμε ακριβή και επικαιροποιημένα στοιχεία. Αν επισημανθούν σφάλματα θα καταβληθεί κάθε προσπάθεια για τη διόρθωσή τους.Ωστόσο, η Επιτροπή δεν φέρει καμία ευθύνη όσον αφορά το περιεχόμενο των εθνικών καταλόγων εμπίστευσης, για τους οποίους την αποκλειστική ευθύνη φέρουν τα κράτη μέλη. Καταβάλλουμε κάθε προσπάθεια ώστε να ελαχιστοποιήσουμε τις διακοπές που προκαλούνται από τεχνικά προβλήματα. Ωστόσο, ορισμένα δεδομένα ή πληροφορίες που περιέχει ο δικτυακός τόπος μπορεί να έχουν δημιουργηθεί ή οργανωθεί σε αρχεία ή μορφότυπους που περιέχουν σφάλματα και γι΄αυτό δεν μπορούμε να εγγυηθούμε ότι η υπηρεσία μας δεν θα διακοπεί, ή δεν θα επηρεαστεί με άλλο τρόπο, από τέτοια προβλήματα. Η Επιτροπή δεν φέρει καμιά ευθύνη όσον αφορά τέτοια προβλήματα που ανακύπτουν κατά τη χρήση αυτού του δικτυακού τόπου, ή οποιουδήποτε άλλου συνδεδεμένου δικτυακού τόπου. Η παρούσα δήλωση αποποίησης ευθύνης δεν έχει σκοπό να περιορίσει την ευθύνη της Ευρωπαϊκής Επιτροπής κατά τρόπο που αντίκειται στις απαιτήσεις της ισχύουσας εθνικής νομοθεσίας ούτε να αποκλείσει την ευθύνη της για ζητήματα για τα οποία δεν μπορεί να αποκλειστεί δυνάμει της εν λόγω νομοθεσίας.</TSLLegalNotice> -+ <TSLLegalNotice xml:lang="fr">Conformément à l'article 2, paragraphe 4, de la décision 2009/767/CE de la Commission du 16 octobre 2009 établissant des mesures destinées à faciliter l’exécution de procédures par voie électronique par l’intermédiaire des «guichets uniques» conformément à la directive 2006/123/CE du Parlement européen et du Conseil relative aux services dans le marché intérieur, modifiée par la décision 2010/425/UE de la Commission et par la décision d’exécution 2013/662/UE de la Commission, la présente liste contient les informations notifiées par les États membres conformément à l'article 2, paragraphe 3, de la décision 2009/767/CE de la Commission. Le présent site de la Commission européenne constitue un outil d'interopérabilité destiné à faciliter l'utilisation des listes de confiance nationales. Notre objectif est de diffuser des informations exactes et à jour. Nous nous efforcerons de corriger les erreurs qui nous seront signalées. Toutefois, la Commission n'assume pas la responsabilité du contenu des listes de confiance nationales, qui incombe exclusivement aux États membres. Nous souhaitons limiter autant que possible les inconvénients occasionnés par des erreurs techniques. Cependant, certaines données ou informations présentes sur notre site peuvent avoir été créées ou structurées dans des fichiers ou des formats qui ne sont pas exempts d'erreurs. Il nous est donc impossible de garantir que notre service ne sera pas interrompu ou autrement affecté par de tels problèmes. La Commission décline toute responsabilité quant aux éventuels problèmes de ce type, résultant d'une utilisation du présent site ou de tout autre site extérieur auquel il renvoie. La présente clause de non-responsabilité n'a pas pour but de limiter la responsabilité de la Commission de manière contraire aux dispositions prévues dans les législations nationales applicables ou de dégager sa responsabilité dans des cas où elle ne peut l'être en vertu desdites législations.</TSLLegalNotice> -+ <TSLLegalNotice xml:lang="it">Conformemente all'articolo 2, paragrafo 4, della decisione della Commissione 2009/767/CE, del 16 ottobre 2009, che stabilisce misure per facilitare l’uso di procedure per via elettronica mediante gli sportelli unici di cui alla direttiva 2006/123/CE del Parlamento europeo e del Consiglio relativa ai servizi nel mercato interno, decisione modificata dalla decisione della Commissione 2010/425/UE e dalla decisione di esecuzione della Commissione 2013/662/UE , la presente lista contiene le informazioni notificate dagli Stati membri a norma dell'articolo 2, paragrafo 3, della decisione 2009/767/CE. Il presente sito della Commissione europea assicura l'interoperabilità necessaria per facilitare l'uso pratico degli elenchi di fiducia nazionali. L'obiettivo perseguito è quello di fornire un'informazione aggiornata e precisa. Qualora dovessero essere segnalati degli errori, si provvederà a correggerli. La Commissione non si assume alcuna responsabilità per quanto riguarda il contenuto degli elenchi di fiducia nazionali, che è di competenza esclusiva degli Stati membri. È nostra cura ridurre al minimo le disfunzioni imputabili a problemi tecnici. Parte dei dati o delle informazioni presenti nel sito potrebbero tuttavia essere stati inseriti o strutturati in archivi o formati non esenti da errori. Non possiamo pertanto garantire che il servizio non subisca interruzioni o che non sia in altro modo influenzato da tali problemi. La Commissione non si assume alcuna responsabilità per gli eventuali problemi derivanti dall'utilizzazione del presente sito o di eventuali siti esterni ad esso collegati. La presente clausola di esclusione della responsabilità non ha lo scopo di limitare la responsabilità della Commissione in violazione di disposizioni della legge nazionale applicabile, né di escluderla nei casi in cui non può essere esclusa in forza di detta legge.</TSLLegalNotice> -+ <TSLLegalNotice xml:lang="lv">Šajā sarakstā ir iekļauta informācija, kuru dalībvalstis Komisijai ir paziņojušas saskaņā ar 2. panta 4. punktu Komisijas 2009. gada 16. oktobra Lēmumā 2009/767/EK par pasākumiem, lai veicinātu procedūru veikšanu elektroniski, izmantojot vienotos kontaktpunktus atbilstoši Eiropas Parlamenta un Padomes Direktīvai 2006/123/EK par pakalpojumiem iekšējā tirgū (minētais Lēmums grozīts ar Komisijas Lēmumu 2010/425/ES un Komisijas Īstenošanas lēmumu 2013/662/ES). Šis saraksts publicēts atbilstīgi Komisijas Lēmuma 2009/767/EK 2. panta 4. punktam. Eiropas Komisija uztur šo tīmekļa vietni, lai sekmētu dalībvalstu uzticamo sarakstu praktisku un savstarpēju izmantošanu. Mēs darām visu, lai nodrošinātu, ka šī informācija ir sniegta laicīgi un ir pareiza. Centīsimies labot norādītās kļūdas. Tomēr Komisija neuzņemas nekādu atbildību vai saistības attiecībā uz dalībvalstu uzticamajos sarakstos sniegto informāciju, jo par tiem atbild vienīgi dalībvalstis. Mēs darām visu, lai līdz minimumam samazinātu traucējumus, ko rada tehniskas kļūmes. Tomēr atsevišķos gadījumos dati vai informācija, kas iekļauta mūsu vietnē, ir sagatavota vai organizēta datnēs vai formātos, kas nefunkcionē nevainojami, un mēs nevaram garantēt, ka šādas problēmas nepārtrauks vai citādi neietekmēs mūsu pakalpojumus. Eiropas Komisija neuzņemas nekādu atbildību par problēmām, kas rodas, izmantojot šo vietni vai kādu citu ārēju vietni, uz kuru esam snieguši hipersaiti. Šī atruna neierobežo Eiropas Komisijas atbildību tad, ja nav ievērotas spēkā esošo valsts tiesību aktu prasības, un neierobežo tās atbildību gadījumos, kad saskaņā ar tiesību aktiem tai atbildība ir jāuzņemas.</TSLLegalNotice> -+ <TSLLegalNotice xml:lang="lt">Remiantis 2009 m. spalio 16 d. Komisijos sprendimo 2009/767/EB, kuriuo pagal Europos Parlamento ir Tarybos direktyvą 2006/123/EB dėl paslaugų vidaus rinkoje nustatomos priemonės procedūroms, atliekamoms naudojantis elektroninėmis priemonėmis ir kontaktinių centrų paslaugomis, palengvinti, iš dalies pakeisto Komisijos sprendimu 2010/425/ES ir Komisijos įgyvendinimo sprendimu 2013/662/ES, 2 straipsnio 4 dalimi, šiame sąraše pateikiama informacija, kurią valstybės narės perdavė pagal Komisijos sprendimo 2009/767/EB 2 straipsnio 3 dalį. Ši Europos Komisijos administruojama interneto svetainė – sąveiki priemonė, skirta praktiniam naudojimuisi valstybių narių patikimais sąrašais palengvinti. Siekiame laiku teikti tikslią informaciją ir ištaisyti visas pastebėtas klaidas. Tačiau Komisija neprisiima atsakomybės ar teisinių įsipareigojimų dėl valstybių narių patikimų sąrašų turinio. Už jį atsakingos tik valstybės narės. Siekiame, kad būtų kuo mažiau nesklandumų dėl techninių klaidų. Tačiau tam tikri mūsų interneto svetainėje skelbiami duomenys gali būti sukurti ar susisteminti tokiose rinkmenose arba tokiais formatais, kuriuose pasitaiko klaidų, todėl negalime užtikrinti, kad tokios problemos nesutrikdys mūsų darbo ar jo kaip nors kitaip nepaveiks. Europos Komisija neprisiima atsakomybės už tokio pobūdžio problemas, kylančias naudojantis šia interneto svetaine arba kitomis su ja susietomis išorės svetainėmis. Šiuo atsakomybės apribojimu nesiekiama sumažinti Europos Komisijos teisinių įsipareigojimų nepažeisti jokių taikytinų nacionalinės teisės reikalavimų ar neprisiimti teisinių įsipareigojimų už tai, už ką pagal tą teisę nuo atsakomybės neatleidžiama.</TSLLegalNotice> -+ <TSLLegalNotice xml:lang="hu">A 2010/425/EU bizottsági határozattal és a 2013/662/EU bizottsági végrehajtási határozattal módosított, az eljárásoknak a belső piaci szolgáltatásokról szóló 2006/123/EK európai parlamenti és tanácsi irányelv szerinti egyablakos ügyintézési pontokon keresztül elektronikus eszközökkel történő teljesítését lehetővé tevő rendelkezések meghatározásáról szóló 2009. október 16-i 2009/767/EK bizottsági határozat 2. cikkének (4) bekezdése értelmében a jelen lista azokat az információkat tartalmazza, amelyeket a tagállamok a 2009/767/EK bizottsági határozat 2. cikkének (3) bekezdése értelmében jelentettek be. Az Európai Bizottság e weblapot a kölcsönös átjárhatóság elősegítésére tartja fönn, abból a célból, hogy megkönnyítse a megbízható szolgáltatók listájának használatát. Célunk az, hogy ezek az információk naprakészek és pontosak legyenek. Amennyiben arról értesülünk, hogy a webhelyen hibás információk szerepelnek, azokat igyekszünk kijavítani. A Bizottság semmilyen felelősséget sem vállal a nemzeti megbízható szolgáltatók listájának tartalmáért, mert azért kizárólag a tagállamok felelősek. Arra törekszünk, hogy az esetleges technikai hibák a lehető legkisebb mértékben okozzanak fennakadásokat a portál működésében. Előfordulhat ugyanakkor, hogy a portál oldalain található adatok vagy információk olyan fájlokban vagy formátumokban állnak rendelkezésre, amelyek nem mentesek a hibáktól; ilyen esetekben nem tudjuk garantálni, hogy ezek a problémák nem okoznak fennakadásokat a webhely használata során. Az Európai Bizottság nem vállal felelősséget a honlap (vagy a belinkelt külső honlapok) használatából fakadó problémákért. E jogi nyilatkozat nem korlátozza az Európai Bizottságnak az alkalmazandó közösségi jogban lefektetett követelményekből fakadó felelősségét, és nem zárja ki a Bizottság felelősségét olyan ügyekben, amelyekért az említett jog értelmében felelősségre vonható.</TSLLegalNotice> -+ <TSLLegalNotice xml:lang="mt">F'konformità mal-Art. 2(4) tad-Deċiżjoni tal-Kummissjoni 2009/767/KE tas-16 ta' Ottubru 2009 li tistipula miżuri li jiffaċilitaw l-użu ta’ proċeduri b’mezzi elettroniċi permezz tal-"punti ta’ kuntatt waħdieni" skont id-Direttiva 2006/123/KE tal-Parlament Ewropew u tal-Kunsill dwar is-servizzi fis-suq intern, kif emendata bid-Deċiżjoni tal-Kummissjoni 2010/425/UE, u d-Deċiżjoni ta' Implimentazzjoni tal-Kummissjoni 2013/662/UE, dan l-elenku fih l-informazzjoni notifikata mill-Istati Membri skont l-Art. 2 (3) tad-Deċiżjoni tal-Kummissjoni 2009/767/KE. Il-Kummissjoni Ewropea żżomm dan is-sit bħala strument ta' interoperabilità ddisinnjat biex jiffaċilita l-użu prattiku tal-Listi ta' Fiduċja nazzjonali. L-għan tagħna hu li nżommu din l-informazzjoni aġġornata u eżatta. Jekk tiġbdulna l-attenzjoni li hemm żbalji, aħna nippruvaw nikkoreġuhom. Madanakollu l-Kummissjoni ma taċċetta l-ebda responsabbiltà fir-rigward tal-kontenut tal-Listi ta' Fiduċja nazzjonali li taqa' esklussivament fuq l-Istati Membri. Huwa l-għan tagħna li nnaqqsu t-tfixkil ikkawżat mill-iżbalji tekniċi. Madanakollu, xi dejta jew informazzjoni fuq is-sit tagħna setgħet inħolqot jew ġiet strutturata f’fajls jew formati li mhumiex ħielsa mill-iżbalji u ma nistgħux niggarantixxu li s-servizz tagħna ma jiġix interrott jew b’xi mod effettwat minn problemi bħal dawn. Il-Kummissjoni ma tieħu l-ebda responsabbiltà għal dawn il-problemi mġarrba bħala riżultat tal-użu ta' dan is-sit jew kwalunkwe siti esterni relatati. Din ir-rinunzja mhijiex maħsuba biex tillimita r-responsabbiltà tal-Kummissjoni fil-kontravenzjoni ta' kwalunkwe rekwiżit stipulat fil-liġi applikabbli tal-Komunità, l-anqas biex tneħħi r-responsabbiltà għal kwistjonijiet li jistgħu ma jkunux esklużi taħt dik il-liġi.</TSLLegalNotice> -+ <TSLLegalNotice xml:lang="nl">Overeenkomstig artikel 2, lid 4, van Beschikking 2009/767/EG van de Commissie van 16 oktober 2009 inzake maatregelen voor een gemakkelijker gebruik van elektronische procedures via het één-loket in het kader van Richtlijn 2006/123/EG van het Europees Parlement en de Raad betreffende diensten op de interne markt, als gewijzigd bij Besluit 2010/425/EU van de Commissie en Uitvoeringsbesluit 2013/662/EU van de Commissie, bevat deze lijst de door de lidstaten meegedeelde gegevens op grond van artikel 2, lid 3, van Beschikking 2009/767/EG. De Europese Commissie wil met deze website het gebruik van de vertrouwenslijsten vergemakkelijken. Ons doel is up-to-date en nauwkeurige informatie aan te bieden. Gesignaleerde fouten worden zo snel mogelijk gecorrigeerd. De Commissie aanvaardt echter geen enkele verantwoordelijkheid of aansprakelijkheid met betrekking tot de informatie op de vertrouwenslijsten. De verantwoordelijkheid hiervoor ligt uitsluitend bij de EU-landen. Wij proberen onderbrekingen door technische storingen zoveel mogelijk te beperken. Sommige gegevens of informatie op onze site kan zijn aangemaakt of omgezet in bestanden of formaten die niet foutloos zijn. Wij kunnen niet uitsluiten dat onze dienstverlening door dergelijke problemen wordt verstoord. De Commissie aanvaardt geen aansprakelijkheid voor die problemen die zich als gevolg van het gebruik van deze site of van andere daarmee verbonden externe sites mochten voordoen. Met deze disclaimer wordt niet beoogd de aansprakelijkheid van de Commissie te beperken in strijd met de in de toepasselijke EU-wetgeving vervatte vereisten, noch haar aansprakelijkheid uit te sluiten voor aangelegenheden die uit hoofde van die wetgeving niet mogen worden uitgesloten.</TSLLegalNotice> -+ <TSLLegalNotice xml:lang="pl">Zgodnie z art. 2 ust. 4 decyzji Komisji 2009/767/WE z dnia 16 października 2009 r. ustanawiającej środki ułatwiające korzystanie z procedur realizowanych drogą elektroniczną poprzez „pojedyncze punkty kontaktowe” zgodnie z dyrektywą 2006/123/WE Parlamentu Europejskiego i Rady dotyczącą usług na rynku wewnętrznym, zmienionej decyzją Komisji 2010/425/UE i decyzją wykonawczą Komisji 2013/662/UE, wykaz ten zawiera informacje przekazane przez państwa członkowskie. Ta strona internetowa Komisji Europejskiej ma ułatwić korzystanie z krajowych zaufanych list. Naszym celem jest dostarczanie aktualnych i ścisłych informacji. Jeśli zostaniemy powiadomieni o błędach, dołożymy wszelkich starań, aby je skorygować. Komisja nie ponosi jednak żadnej odpowiedzialności za treść krajowych zaufanych list, za którą odpowiadają wyłącznie państwa członkowskie. Naszym celem jest ograniczenie do minimum zakłóceń wynikających z błędów technicznych. Jednak niektóre z zamieszczonych w tym serwisie danych lub informacji mogły być utworzone lub zamieszczone w plikach lub formatach, które nie są wolne od błędów, w związku z czym nie możemy zagwarantować, że problemy takie nie spowodują przerw w dostępie do serwisu lub innych zakłóceń w jego funkcjonowaniu. Komisja Europejska nie bierze odpowiedzialności w związku z tego rodzaju problemami będącymi następstwem korzystania z tego serwisu lub jakichkolwiek serwisów zewnętrznych, do których odsyła niniejszy serwis. Niniejsze zastrzeżenie nie ma na celu ograniczenia odpowiedzialności Komisji Europejskiej w przypadku naruszenia jakichkolwiek wymagań określonych w stosownych przepisach prawa krajowego ani wyłączenia jej odpowiedzialności za kwestie, które na gruncie tego prawa nie podlegają wyłączeniu.</TSLLegalNotice> -+ <TSLLegalNotice xml:lang="pt">Em conformidade com o n.º 4 do artigo 2.° da Decisão 2009/767/CE da Comissão, de 16 de Outubro de 2009, que determina medidas destinadas a facilitar a utilização de procedimentos informatizados através de balcões únicos, nos termos da Directiva 2006/123/CE do Parlamento Europeu e do Conselho relativa aos serviços no mercado interno, com a redacção que lhe foi dada pela Decisão 2010/425/EU e pela Decisão de Execução 2013/662/UE da Comissão, a presente lista contém as informações notificadas pelos Estados-Membros ao abrigo do n.º 3 do artigo 2.° da Decisão 2009/767/CE da Comissão. Este sítio Web da Comissão Europeia assegura a interoperabilidade necessária para facilitar uma utilização eficaz das listas aprovadas e tem por objectivo fornecer informações exactas e actualizadas. Procuraremos corrigir todos os erros que nos forem comunicados. Contudo, a Comissão declina toda e qualquer responsabilidade quanto ao conteúdo das listas aprovadas nacionais, que incumbe exclusivamente aos Estados-Membros. É nosso objectivo reduzir ao mínimo os inconvenientes causados por erros técnicos. Contudo, determinados dados constantes do nosso sítio podem ter sido criados ou estruturados em ficheiros ou formatos não isentos de erros, pelo que não podemos garantir um serviço sem interrupções ou perturbações. A Comissão declina qualquer responsabilidade por eventuais problemas que surjam na sequência da consulta deste sítio ou de quaisquer sítios externos a que as ligações dêem acesso. A presente declaração de exoneração de responsabilidade não pretende limitar a responsabilidade da Comissão Europeia de uma forma que contrarie o disposto na legislação nacional aplicável, nem excluir a sua responsabilidade nos casos em que tal não é permitido por essa legislação.</TSLLegalNotice> -+ <TSLLegalNotice xml:lang="ro">În conformitate cu articolul 2 alineatul (4) din Decizia Comisiei 2009/767/CE din 16 octombrie 2009 de stabilire a unor măsuri de facilitare a utilizării procedurilor prin mijloace electronice prin intermediul „ghișeelor unice” în temeiul Directivei 2006/123/CE a Parlamentului European și a Consiliului privind serviciile în cadrul pieței interne, așa cum a fost modificată prin Decizia Comisiei 2010/425/UE și prin Decizia de punere în aplicare 2013/662/UE a Comisiei, prezenta listă conține informațiile notificate de statele membre în conformitate cu articolul 2 alineatul (3) din Decizia Comisiei 2009/767/CE. Comisia Europeană utilizează acest site ca instrument de facilitare a utilizării Listelor naționale sigure, prin sporirea interoperabilității. Scopul nostru este ca aceste informații să fie actualizate și exacte. În cazul în care ni se vor semnala erori, vom încerca să le corectăm. Totuși, Comisia nu își asumă niciun fel de responsabilitate cu privire la conținutul Listelor naționale sigure, care intră, integral, în sarcina statelor membre. De asemenea, ne propunem să reducem consecințele negative cauzate de erori tehnice. Cu toate acestea, este posibil ca unele date sau informații de pe site-ul nostru să fi fost create sau structurate în fișiere sau formate care pot prezenta erori. Prin urmare, nu putem garanta că serviciile noastre nu vor fi întrerupte sau afectate de asemenea probleme. Comisia Europeană nu își asumă nicio responsabilitate cu privire la eventuale probleme survenite ca urmare a utilizării acestui site sau a oricăror alte site-uri externe la care face trimitere. Această denegare de responsabilitate nu este destinată să limiteze răspunderea Comisiei Europene într-un mod care contravine reglementărilor prevăzute de legislația internă aplicabilă și nu exclude răspunderea sa în cazuri care, în conformitate cu legislația respectivă, aceasta nu poate fi exclusă.</TSLLegalNotice> -+ <TSLLegalNotice xml:lang="sk">V súlade s článkom 2 ods. 4 rozhodnutia Komisie 2009/767/ES zo 16. októbra 2009, ktorým sa ustanovujú opatrenia na uľahčenie postupov elektronickými spôsobmi prostredníctvom miest jednotného kontaktu podľa smernice Európskeho parlamentu a Rady 2006/123/ES o službách na vnútornom trhu, zmeneného rozhodnutím Komisie 2010/425/EÚ a vykonávacím rozhodnutím Komisie 2013/662/EÚ, tento zoznam obsahuje informácie oznámené členskými štátmi podľa článku 2 ods. 3 rozhodnutia Komisie 2009/767/ES. Európska komisia spravuje tieto internetové stránky ako interoperabilný nástroj, ktorý slúži na uľahčenie praktického využitia zoznamov dôveryhodných informácií. Naším cieľom je poskytovať tieto informácie včas a správne. Ak budeme upozornení na chyby, pokúsime sa ich napraviť. Komisia však nepreberá žiadnu zodpovednosť, ani inak neručí za obsah zoznamov dôveryhodných informácií, ktoré poskytli členské štáty. Je naším cieľom minimalizovať technické chyby. Niektoré informácie alebo údaje na tejto webovej lokalite však mohli byť vytvorené v chybných súboroch alebo formátoch, a preto nemožno zaručiť, že tieto problémy nespôsobia výpadok alebo inú poruchu našej webovej lokality. Komisia nenesie žiadnu zodpovednosť za podobné chyby, ktoré sa zistia pri používaní tejto lokality alebo pridružených externých lokalít. Zámerom tohto vyhlásenia o odmietnutí zodpovednosti nie je obmedzenie zodpovednosti Európskej komisie v rozpore s požiadavkami ustanovenými v príslušných vnútroštátnych predpisoch ani vylúčenie jej zodpovednosti vo veciach, v ktorých ju podľa týchto predpisov nie je možné vylúčiť.</TSLLegalNotice> -+ <TSLLegalNotice xml:lang="sl">Seznam v skladu s členom 2(4) Odločbe Komisije 2009/767/ES z dne 16. oktobra 2009 o vzpostavitvi ukrepov za pospeševanje uporabe postopkov po elektronski poti s pomočjo „enotnih kontaktnih točk“ po Direktivi 2006/123/ES Evropskega parlamenta in Sveta o storitvah na notranjem trgu, kakor je bila spremenjena z Odločbo Komisije 2010/425/EU in Izvedbenim sklepom Komisije 2013/662/EU, vsebuje informacije, ki so jih v skladu s členom 2 (3) Odločbe Komisije 2009/767/ES sporočile države članice. Evropska komisija si prizadeva izboljšati praktično uporabo zanesljivih seznamov držav članic. Temu je namenjeno tudi to spletišče. Želimo zagotavljati pravočasne in točne informacije. Če nas boste opozorili na morebitne napake, jih bomo poskušali čimprej odpraviti. Komisija ne prevzema nikakršne zakonske ali druge odgovornosti glede vsebine nacionalnih zanesljivih seznamov, za katero so odgovorne izključno države članice. Uporabnikom želimo omogočiti nemoteno uporabo s čim manj tehničnimi napakami. Vendar so lahko nekateri podatki in informacije na našem spletišču v datotekah ali obliki, ki niso popolnoma brez napak, zato ne moremo zagotoviti, da takšne težave ne bodo vplivale na zagotavljanje naših storitev. Komisija ne prevzema nobene odgovornosti v zvezi s težavami, ki so posledica uporabe tega spletišča ali povezanega zunanjega spletišča. Izjava ne omejuje odgovornosti Evropske komisije pri kakršnem koli delovanju v nasprotju z veljavno nacionalno zakonodajo, niti ne izključuje odgovornosti za dejanja, ki jih v skladu s to zakonodajo ni mogoče izključiti.</TSLLegalNotice> -+ <TSLLegalNotice xml:lang="fi">Tämä luettelo sisältää komission päätöksen 2009/767/EY 2 artiklan 4 kohdan mukaisesti tiedot, jotka EU-maat ovat toimittaneet komissiolle päätöksen 2009/767/EY 2 artiklan 3 kohdan mukaisesti (komission päätös 2009/767/EY, tehty 16 päivänä lokakuuta 2009, toimenpiteistä sähköisten menettelyjen käytön edistämiseksi keskitettyjä asiointipisteitä käyttäen palveluista sisämarkkinoilla annetun Euroopan parlamentin ja neuvoston direktiivin 2006/123/EY mukaisesti, sellaisena kuin se on muutettuna komission päätöksellä 2010/425/EU ja komissio täytäntöönpanopäätöksellä 2013/662/EU). Euroopan komissio ylläpitää tätä verkkosivustoa helpottaakseen kansallisten luotettavien luetteloiden käyttöä. Pyrimme pitämään tiedot ajantasaisina ja virheettöminä. Pyrimme korjaamaan tietoomme tulleet virheet. Komissio ei kuitenkaan voi olla vastuussa kansallisten luotettavien luetteloiden sisällöstä, joka on yksinomaan jäsenvaltioiden vastuulla. Tavoitteenamme on minimoida teknisten häiriöiden aiheuttamat haitat. Jotkin tiedot sivustollamme on voitu luoda tai muotoilla sellaiseen muotoon tai sellaisiin tiedostoihin, jotka eivät ole virheettömiä, emmekä voi taata, ettei palvelumme keskeydy tai etteivät kyseiset ongelmat muutoin vaikuta siihen. Euroopan komissio ei vastaa ongelmista, jotka johtuvat tämän sivuston tai siihen linkitettyjen ulkopuolisten sivustojen käytöstä. Tämän vastuuvapauslausekkeen tarkoituksena ei ole rajoittaa Euroopan komission vastuuta vastoin sovellettavan kansallisen lain vaatimuksia tai poistaa komission vastuuta seikoista, joiden osalta vastuuta ei sovellettavan kansallisen lain mukaan voida poistaa.</TSLLegalNotice> -+ <TSLLegalNotice xml:lang="sv">Av listan framgår var du kan hitta den information som EU-länderna har anmält, och som kommissionen måste tillhandahålla, enligt artikel 2.3 och 2.4 i kommissionens beslut 2009/767/EG av den 16 oktober 2009 om åtgärder som underlättar användningen av förfaranden på elektronisk väg genom gemensamma kontaktpunkter i enlighet med Europaparlamentets och rådets direktiv 2006/123/EG om tjänster på den inre marknaden, ändrad genom kommissionens beslut 2010/425/EU och kommissionens genomförandebeslut 2013/662/EU. Vi har samlat informationen på den här webbplatsen, så att du lättare ska kunna använda den i praktiken. Vi strävar efter att hålla informationen aktuell och korrekt. Om felaktigheter kommer till vår kännedom, försöker vi att rätta till dem. Vi frånsäger oss dock allt ansvar för de nationella förteckningarna. Medlemsländerna ansvarar helt och hållet själva för innehållet. Vi strävar efter att så långt som möjligt undvika tekniska störningar. En del uppgifter eller information på vår sida kan dock ha skapats eller strukturerats i filer eller format som inte är felfria. Vi kan inte garantera att den service vi tillhandahåller kommer att vara fri från avbrott eller andra störningar som har att göra med sådana problem. Kommissionen frånsäger sig allt ansvar för problem som kan uppstå till följd av att denna webbplats eller någon av dess länkar har använts. Denna ansvarsfriskrivning är inte avsedd att inskränka kommissionens ansvar i strid med tillämplig nationell lagstiftning eller att utesluta ansvar för kommissionen i de fall där friskrivning inte får ske enligt sådan lagstiftning.</TSLLegalNotice> -+ <TSLLegalNotice xml:lang="hr">U skladu s člankom 2. stavkom 4. Odluke Komisije 2009/767/EZ od 16. listopada 2009. o utvrđivanju mjera kojima se olakšava uporaba postupaka elektroničkim putem preko „jedinstvenih kontaktnih točaka” u skladu s Direktivom 2006/123/EZ Europskog parlamenta i Vijeća o uslugama na unutarnjem tržištu, kako je izmijenjena Odlukom Komisije 2010/425/EU i Provedbenom odlukom Komisije 2013/662/EU, trenutačni popis sadržava informacije o kojima su države članice izvijestile u skladu s člankom 2. stavkom 3. Odluke Komisije 2009/767/EZ. Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperabilnosti koje je napravljeno kako bi olakšalo praktičnu primjenu nacionalnih pouzdanih popisa. Naš je cilj ove informacije održavati pravodobnim i točnim. Ukaže li nam se na pogreške, pokušat ćemo ih otkloniti. No, Komisija ne preuzima nikakvu odgovornost za sadržaj nacionalnih pouzdanih popisa, jer su za njega odgovorne isključivo države članice. Cilj nam je smetnje uzrokovane tehničkim pogreškama svesti na minimum. Međutim, postoji mogućnost da su neki podaci i informacije na našim stranicama izrađeni ili strukturirani u datotekama ili formatima koji nisu bez pogrešaka te stoga ne možemo jamčiti da će se naše usluge odvijati bez prekida ili da takvi problemi neće na neki drugi način utjecati na njih. Europska Komisija ne preuzima nikakvu odgovornost u vezi s problemima koji nastanu zbog uporabe ovih stranica ili bilo kojih povezanih vanjskih stranica. Ovom se izjavom o ograničenju odgovornosti ne ograničava odgovornost Europske Komisije u slučaju kršenja uvjeta propisanih primjenjivim nacionalnim pravom niti se isključuje njezina odgovornost u slučajevima u kojima u skladu s tim pravom to nije moguće.</TSLLegalNotice> -+ </PolicyOrLegalNotice> -+ <HistoricalInformationPeriod>65535</HistoricalInformationPeriod> -+ <PointersToOtherTSL> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEOzCCAyOgAwIBAgIJAKP8xLe3bmRsMA0GCSqGSIb3DQEBCwUAMFoxCzAJBgNVBAYTAkFUMS8wLQYDVQQKEyZSdW5kZnVuayB1bmQgVGVsZWtvbSBSZWd1bGllcnVuZ3MtR21iSDEaMBgGA1UEAxMRVHJ1c3RlZCBMaXN0IENBIDEwHhcNMTQwMTI4MTgxNTE4WhcNMTcwMTI4MTgxNTE4WjBXMQswCQYDVQQGEwJBVDEvMC0GA1UEChMmUnVuZGZ1bmsgdW5kIFRlbGVrb20gUmVndWxpZXJ1bmdzLUdtYkgxFzAVBgNVBAMTDlRydXN0ZWQgTGlzdCA0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuh3Ht0BXqmhmMcFDPgSV10WyLlwe3PFoIrgeg3cYQEF+YOtiV5nm6dJnlxoXcO5TJIfbXoSdSOYJTtCuQvZDySHTlSvM5Mr29GRjA489ZKE7pEaI9semFeMyvPaJ/EvaG3ShvrQlLebsS4ALk8JXTRTalZmBlbWi9jK2IFMQaLjQN88K2aUrDZqIqRR4WhBP7T4I3dSVYVmi0TR41JWyaVXKWp7b9WJULewVTf0g+72qwtd7VZo0zQuQgAUsT9bOv8K6PyNIMShh3fLXefaIlmXnPsua6bKc1VAjjR91f83koKUOmDIUciFCsyksa/HUV1tAcZdUZsYe/1JGEJ1CEwIDAQABo4IBBTCCAQEwHwYDVR0jBBgwFoAUsJT0MPOFfU37Ha8aHJ6ELK/YXBkwHQYDVR0OBBYEFNlVL81aLTXfTM3az8PKyBbeWvvFMA4GA1UdDwEB/wQEAwIHgDAWBgNVHSAEDzANMAsGCSooAA8AAQEBADAJBgNVHRMEAjAAMBEGA1UdJQQKMAgGBgQAkTcDADA2BgNVHR8ELzAtMCugKaAnhiVodHRwczovL3d3dy5zaWduYXR1ci5ydHIuYXQvdGxjYTEuY3JsMEEGCCsGAQUFBwEBBDUwMzAxBggrBgEFBQcwAoYlaHR0cHM6Ly93d3cuc2lnbmF0dXIucnRyLmF0L3RsY2ExLmNlcjANBgkqhkiG9w0BAQsFAAOCAQEAHrMrSL2PDCplhLKXmrspfEyjDcCxm6LtoHF58gtZ/kuPQEXzib/6ncxp8wu+HzkHLkZd38rVWgXObngHoKY2F6WtO48xtXgJ7zv2f3Km4yvEuXm/Ro7hzizDatuLZdzCiu97rnvRxCbaQV2XV73dmki+a87ybEGFQGVKBfSM0rEy0p0FD+fRtRvwYafvKjzbC93OJOD7FepEKsHO8CHFWG8X4VxPjkKy/R1yPn2tT/yio626AnKRDqy9/bUQFWITzKMHkVNZY1OMTL7WXjmWFc7L+b0Wt15xBO0YuNg3delXE8aNXdizYDlTzbJUpmq8EcuxHQlMMDQUBtyDcj0RcA==</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEOzCCAyOgAwIBAgIJAKP8xLe3bmRtMA0GCSqGSIb3DQEBCwUAMFoxCzAJBgNVBAYTAkFUMS8wLQYDVQQKEyZSdW5kZnVuayB1bmQgVGVsZWtvbSBSZWd1bGllcnVuZ3MtR21iSDEaMBgGA1UEAxMRVHJ1c3RlZCBMaXN0IENBIDEwHhcNMTQwMTI4MTgzMzI5WhcNMTgwMTI4MTgzMzI5WjBXMQswCQYDVQQGEwJBVDEvMC0GA1UEChMmUnVuZGZ1bmsgdW5kIFRlbGVrb20gUmVndWxpZXJ1bmdzLUdtYkgxFzAVBgNVBAMTDlRydXN0ZWQgTGlzdCA1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxsSAzrdy4zFiN1bypCT2LZ5O07y9nTJxNlFXERfTzf0zSEtOKXTjxuRQvXvDSfvvar2au9QDuUEdA+jO9NlBFfHfl95ON/gGhQG/NLplVfVB80y4/iX08O43ZuDXcZbBaNdg6M/2qCwflXBakkwaiF7l2kJQyPl+w9hkSi3LBLRfssJOsk5K8VxaILW680gwVX+9BeShXKn5Fr5vde1G1rAKjs6kNtIlrGLWEXyVeAcdDZNKO16MynSMAUeoyz1k74vdWV1/ixrz2DtgeD/rJOnIiDrBqReJzFyZ74iCIsC4EtiIAg5nEah0krWPH6Yhsurqo8zKYDaZAhmJ2hK39wIDAQABo4IBBTCCAQEwHwYDVR0jBBgwFoAUsJT0MPOFfU37Ha8aHJ6ELK/YXBkwHQYDVR0OBBYEFC9vHwsF0o04l9zC+UONiidHmxfJMA4GA1UdDwEB/wQEAwIHgDAWBgNVHSAEDzANMAsGCSooAA8AAQEBADAJBgNVHRMEAjAAMBEGA1UdJQQKMAgGBgQAkTcDADA2BgNVHR8ELzAtMCugKaAnhiVodHRwczovL3d3dy5zaWduYXR1ci5ydHIuYXQvdGxjYTEuY3JsMEEGCCsGAQUFBwEBBDUwMzAxBggrBgEFBQcwAoYlaHR0cHM6Ly93d3cuc2lnbmF0dXIucnRyLmF0L3RsY2ExLmNlcjANBgkqhkiG9w0BAQsFAAOCAQEAfOCwly06iznOF0juUqqXkC0YoQDwVD8OqlevpJkrvAEl+uYTEa0XzBdTCZ+zXdJW6Icgt+pces+RjeFh4tIQgBkwqPWqmnTqw37ysxgqPO0EHXGu/zLdoA2+8TLLsu9csQ+NY4qNfxFXTWoFqlaUC6Af86Tds7QyjVyqOTMjxS8QKqNfI3bLvc9dSH+oi1v2xsFAl/igoKTqWRhad79lroBRKG6SqNR6Y5WqVFMHToZMD+cdulJE6jrKp3hZQrU/8qkKlqTiem6x2NkKAsGZ13+j25P9Pb3x6hh1gV0A1urI1kG+4cj8UDqLhpPXJN/ZtF95WBaioUhiEae3gojXlA==</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>https://www.signatur.rtr.at/currenttl.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>AT</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Rundfunk und Telekom Regulierungs-GmbH</Name> -+ <Name xml:lang="de">Rundfunk und Telekom Regulierungs-GmbH</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/AT</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIID3zCCAsegAwIBAgIJAOOTbJMmowFCMA0GCSqGSIb3DQEBBQUAMIGHMS0wKwYDVQQDEyRCZWxnaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IxSTBHBgNVBAoTQEZQUyBFY29ub215LCBTTUVzLCBTZWxmLWVtcGxveWVkIGFuZCBFbmVyZ3kgLSBRdWFsaXR5IGFuZCBTYWZldHkxCzAJBgNVBAYTAkJFMB4XDTE0MDIxOTEzMzcxNVoXDTI0MDIxNzEzMzcxNVowgYcxLTArBgNVBAMTJEJlbGdpYW4gVHJ1c3RlZCBMaXN0IFNjaGVtZSBPcGVyYXRvcjFJMEcGA1UEChNARlBTIEVjb25vbXksIFNNRXMsIFNlbGYtZW1wbG95ZWQgYW5kIEVuZXJneSAtIFF1YWxpdHkgYW5kIFNhZmV0eTELMAkGA1UEBhMCQkUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAgEFkoDPTYDvGk+/IPnGSPm58NRE7mpzLHk8lxpYnTAtbMhn7FWru9GlNi+blYYNOEmzN2E5KO9+7AAAMmx2x8zmEMwc3oUQ7E0WN5Gl+Y+7n6NtX50D/4Sbw4IjVvwwRRru8Coj5vq5Hz3JKTgft8teEpwb5vSFZh6+o9irdX342RJU4AtG78sxZvzIqpa3WsddMf5XDyjnGK3dRgkDuOaBxWEexuUiN4LvO+MacwoaxEqLhEZ6TALGWS2WmNEW3OlUdf7nc0Tz/lnyQsuFn01c4pg56hjyxLtpjyHwNwbTDx+cjBpBveOT9Nb6UfKFHknC5AfrIOWnFLXUmyKD/AgMBAAGjTDBKMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgbAMB0GA1UdDgQWBBRf745pXfv0l1rxBwgOUhlQqteQUTARBgNVHSUECjAIBgYEAJE3AwAwDQYJKoZIhvcNAQEFBQADggEBAG8j1gOIKEKTd904EepYs1MioBErjXxkAN2zvaZevh3awkB6cGeQUnmDz3ve4ZCJSB4MZ138EkUi2eobXaPyaLv01vl6sM6eUj6QhwNvfGXHP99AOHG8ZyH4IkJgB+8jImhg2danj4VcAosGtvTknYtZ2K+GhRevgAnoryhJ7A7jszwWzaahFwTnunymlBXlrwG9KyBSkg4IhWgc+IgYUgA7rpOZ6zXFPTJQJphiRg7pQECnV1Fvw9ediMGhBnNL3tE/5IKIug2XoJ3Mlh9lho6c8YAhyp2Q16inCLDJksZc1qUqRHo9lmwWnGANWfZvQWRJS0LJvrF7LSL5H/Y4yZo=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIID3zCCAsegAwIBAgIJAIg4aOU7at17MA0GCSqGSIb3DQEBBQUAMIGHMS0wKwYDVQQDEyRCZWxnaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IxSTBHBgNVBAoTQEZQUyBFY29ub215LCBTTUVzLCBTZWxmLWVtcGxveWVkIGFuZCBFbmVyZ3kgLSBRdWFsaXR5IGFuZCBTYWZldHkxCzAJBgNVBAYTAkJFMB4XDTE0MDIxOTEzMzcyN1oXDTI0MDYxNjEzMzcyN1owgYcxLTArBgNVBAMTJEJlbGdpYW4gVHJ1c3RlZCBMaXN0IFNjaGVtZSBPcGVyYXRvcjFJMEcGA1UEChNARlBTIEVjb25vbXksIFNNRXMsIFNlbGYtZW1wbG95ZWQgYW5kIEVuZXJneSAtIFF1YWxpdHkgYW5kIFNhZmV0eTELMAkGA1UEBhMCQkUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAgEFkoDPTYDvGk+/IPnGSPm58NRE7mpzLHk8lxpYnTAtbMhn7FWru9GlNi+blYYNOEmzN2E5KO9+7AAAMmx2x8zmEMwc3oUQ7E0WN5Gl+Y+7n6NtX50D/4Sbw4IjVvwwRRru8Coj5vq5Hz3JKTgft8teEpwb5vSFZh6+o9irdX342RJU4AtG78sxZvzIqpa3WsddMf5XDyjnGK3dRgkDuOaBxWEexuUiN4LvO+MacwoaxEqLhEZ6TALGWS2WmNEW3OlUdf7nc0Tz/lnyQsuFn01c4pg56hjyxLtpjyHwNwbTDx+cjBpBveOT9Nb6UfKFHknC5AfrIOWnFLXUmyKD/AgMBAAGjTDBKMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgbAMB0GA1UdDgQWBBRf745pXfv0l1rxBwgOUhlQqteQUTARBgNVHSUECjAIBgYEAJE3AwAwDQYJKoZIhvcNAQEFBQADggEBAARQuvNV68TF35U7OsMlmYQKaST7Ep2VytJXinRPFAmMJWM9f59ZkSH86BNi7bLo3llYyfUgEZYLwLQXFImMBvme0FmqNbtYsbz6pNi0kW7yYrNa0Gq27Mh5sMB7+6mWUWNU82zRoFGGAz5lE1ID/w2hLRb5vk+rpY3MatT9BRpGfQP8sxyD2PsWr6sTmR11FY/+iOGVkPnZ9ZzyIPKegEFVfyuuMZWS0Dovyqsk9V392e+Y2IyPZfLRAwlPPoXWNtZ70cu0w3ZSn7/0lHCJtijbSJtZ1fDGggwqDv3imx5dzEDkqKluFQ5YjVL7tSYu/tzplS6Qn2kubGpItEe7R8k=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIID3zCCAsegAwIBAgIJAJH6V+OXuB7aMA0GCSqGSIb3DQEBBQUAMIGHMS0wKwYDVQQDEyRCZWxnaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IxSTBHBgNVBAoTQEZQUyBFY29ub215LCBTTUVzLCBTZWxmLWVtcGxveWVkIGFuZCBFbmVyZ3kgLSBRdWFsaXR5IGFuZCBTYWZldHkxCzAJBgNVBAYTAkJFMB4XDTE0MDIxOTEzMzc0MFoXDTI0MTAxNDEzMzc0MFowgYcxLTArBgNVBAMTJEJlbGdpYW4gVHJ1c3RlZCBMaXN0IFNjaGVtZSBPcGVyYXRvcjFJMEcGA1UEChNARlBTIEVjb25vbXksIFNNRXMsIFNlbGYtZW1wbG95ZWQgYW5kIEVuZXJneSAtIFF1YWxpdHkgYW5kIFNhZmV0eTELMAkGA1UEBhMCQkUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAgEFkoDPTYDvGk+/IPnGSPm58NRE7mpzLHk8lxpYnTAtbMhn7FWru9GlNi+blYYNOEmzN2E5KO9+7AAAMmx2x8zmEMwc3oUQ7E0WN5Gl+Y+7n6NtX50D/4Sbw4IjVvwwRRru8Coj5vq5Hz3JKTgft8teEpwb5vSFZh6+o9irdX342RJU4AtG78sxZvzIqpa3WsddMf5XDyjnGK3dRgkDuOaBxWEexuUiN4LvO+MacwoaxEqLhEZ6TALGWS2WmNEW3OlUdf7nc0Tz/lnyQsuFn01c4pg56hjyxLtpjyHwNwbTDx+cjBpBveOT9Nb6UfKFHknC5AfrIOWnFLXUmyKD/AgMBAAGjTDBKMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgbAMB0GA1UdDgQWBBRf745pXfv0l1rxBwgOUhlQqteQUTARBgNVHSUECjAIBgYEAJE3AwAwDQYJKoZIhvcNAQEFBQADggEBABSri/BFtWHsvDgFri/fPFXJaQ9a5U1HgfOrg0pcVacnC2ezhZ3Ita1d+nWlaHfUBx2L7pp41G23TZE9Efcb/8RPuYDDcIv2TSKV/hIxthk+IP6avZ6cEuWL3iXhqusRM313QgH8G67EPDmTy9hX0t/3KnBQZ6gmb9SpTnG44pQ8LOfLvpzaT2Z1etBsXp0JED7P0OPJq459S3huIYoM3NTNaU8dLGAYJUR7D2fcvDySvt8xIjO7HtzHer79Uq4bNn8uRRHgKJ2LMBK0LvoVBX0PekQFSXi06xpPA9SjmozZ76dW0fK7uPUOFoXB9LtsZCFsMRjTL9+KhPyhSam2iy8=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIID3zCCAsegAwIBAgIJAK7RpgGHETKPMA0GCSqGSIb3DQEBBQUAMIGHMS0wKwYDVQQDEyRCZWxnaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IxSTBHBgNVBAoTQEZQUyBFY29ub215LCBTTUVzLCBTZWxmLWVtcGxveWVkIGFuZCBFbmVyZ3kgLSBRdWFsaXR5IGFuZCBTYWZldHkxCzAJBgNVBAYTAkJFMB4XDTE0MDIxOTEzMzc1MloXDTI1MDIxMTEzMzc1MlowgYcxLTArBgNVBAMTJEJlbGdpYW4gVHJ1c3RlZCBMaXN0IFNjaGVtZSBPcGVyYXRvcjFJMEcGA1UEChNARlBTIEVjb25vbXksIFNNRXMsIFNlbGYtZW1wbG95ZWQgYW5kIEVuZXJneSAtIFF1YWxpdHkgYW5kIFNhZmV0eTELMAkGA1UEBhMCQkUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAgEFkoDPTYDvGk+/IPnGSPm58NRE7mpzLHk8lxpYnTAtbMhn7FWru9GlNi+blYYNOEmzN2E5KO9+7AAAMmx2x8zmEMwc3oUQ7E0WN5Gl+Y+7n6NtX50D/4Sbw4IjVvwwRRru8Coj5vq5Hz3JKTgft8teEpwb5vSFZh6+o9irdX342RJU4AtG78sxZvzIqpa3WsddMf5XDyjnGK3dRgkDuOaBxWEexuUiN4LvO+MacwoaxEqLhEZ6TALGWS2WmNEW3OlUdf7nc0Tz/lnyQsuFn01c4pg56hjyxLtpjyHwNwbTDx+cjBpBveOT9Nb6UfKFHknC5AfrIOWnFLXUmyKD/AgMBAAGjTDBKMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgbAMB0GA1UdDgQWBBRf745pXfv0l1rxBwgOUhlQqteQUTARBgNVHSUECjAIBgYEAJE3AwAwDQYJKoZIhvcNAQEFBQADggEBABabI8rU/pW4uiTHk47X838qntx6FJ5iDCs+iaED142+yju/wQVU4J8rjS4UqsdO8wOM4sfyLjMLRRsK60saZ5o2u+tLIj0QrFRytTD1WIuPZxpBjQU8Zj/+aLkr4bQmyqgJ4XzJZ9BMvi3Yv18jQxJSjvGpXaWpUNLNnhENTuzKv8f/0vBn2Inmpg7cwgj2q8qhZ/3r1ZmHETSDmEdjV4ovYruAKX58jwwnRdgacTtgQpB88+zZDtAp3FVJxR9nefCdvjV2nuN++UgA2v8d2u9c8c7ObGd7dL6O9rQCfvBWbw6/h9nkXSJSAjKXS1uvnABtq3fQabHwxNc8rIQPkLk=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIID3zCCAsegAwIBAgIJAOv7FV6q0Or/MA0GCSqGSIb3DQEBBQUAMIGHMS0wKwYDVQQDEyRCZWxnaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IxSTBHBgNVBAoTQEZQUyBFY29ub215LCBTTUVzLCBTZWxmLWVtcGxveWVkIGFuZCBFbmVyZ3kgLSBRdWFsaXR5IGFuZCBTYWZldHkxCzAJBgNVBAYTAkJFMB4XDTE0MDIxOTEzMzgwNFoXDTI1MDYxMTEzMzgwNFowgYcxLTArBgNVBAMTJEJlbGdpYW4gVHJ1c3RlZCBMaXN0IFNjaGVtZSBPcGVyYXRvcjFJMEcGA1UEChNARlBTIEVjb25vbXksIFNNRXMsIFNlbGYtZW1wbG95ZWQgYW5kIEVuZXJneSAtIFF1YWxpdHkgYW5kIFNhZmV0eTELMAkGA1UEBhMCQkUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAgEFkoDPTYDvGk+/IPnGSPm58NRE7mpzLHk8lxpYnTAtbMhn7FWru9GlNi+blYYNOEmzN2E5KO9+7AAAMmx2x8zmEMwc3oUQ7E0WN5Gl+Y+7n6NtX50D/4Sbw4IjVvwwRRru8Coj5vq5Hz3JKTgft8teEpwb5vSFZh6+o9irdX342RJU4AtG78sxZvzIqpa3WsddMf5XDyjnGK3dRgkDuOaBxWEexuUiN4LvO+MacwoaxEqLhEZ6TALGWS2WmNEW3OlUdf7nc0Tz/lnyQsuFn01c4pg56hjyxLtpjyHwNwbTDx+cjBpBveOT9Nb6UfKFHknC5AfrIOWnFLXUmyKD/AgMBAAGjTDBKMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgbAMB0GA1UdDgQWBBRf745pXfv0l1rxBwgOUhlQqteQUTARBgNVHSUECjAIBgYEAJE3AwAwDQYJKoZIhvcNAQEFBQADggEBAJQt17IzKeqnxakdgysT1FlymocZUUHGhfbQAfr4OEm48LMoN4M5ZeeRMVIwk4jODURuhawtKJ3hRdGB+zTzIMLheOmAGGRDUNrDwctpn8G+RqEFjlgc5yi1ICHBZJrvyud7cPwz8AwMtV+K1iFmbEWqsGASZ96J9uilJJ+RkPcV3Olwtgi3+IxOxHfhmq0PCdRk1k8+c7frdT935Z8SfFgnaPy4RFg2eKdvC2qsvsF3J19eP/BKlGdVVe44yTB3UCE3KSLiySvgM/JXIQN5VE+lGPeURKnoXsW5E71IdUEi30Ptd0YBxTjEairZKyzhgGbZEnBUWSkn6n9uZ5Ai2lo=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://tsl.belgium.be/tsl-be.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>BE</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">FPS Economy, SMEs, Self-employed and Energy - Quality and Safety</Name> -+ <Name xml:lang="fr">SPF Economie, PME, Classes moyennes et Energie - Qualité et Sécurité</Name> -+ <Name xml:lang="nl">FOD Economie, KMO, Middenstand en Energie - Kwaliteit en Veiligheid</Name> -+ <Name xml:lang="de">FÖD Wirtschaft, KMU, Mittelstand und Energie - Qualität und Sicherheit</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/BE</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIFUTCCBDmgAwIBAgIIM7DFMDyB1XwwDQYJKoZIhvcNAQEFBQAwgYcxgYQwCQYDVQQGDAJCRzAVBgNVBAMMDkNSQyBNZW1iZXJzIENBMBUGA1UECwwOQ1JDIE1lbWJlcnMgQ0EwHAYKCZImiZPyLGQBGRYOY3JjLW1lbWJlcnMtY2EwKwYDVQQKDCRDb21tdW5pY2F0aW9ucyBSZWd1bGF0aW9uIENvbW1pc3Npb24wHhcNMTIxMTE1MTEyODA1WhcNMTcxMTE1MTEyODA1WjCB6DGB5TAJBgNVBAYMAkJHMAsGA1UEEQwEMTAwMDAMBgNVBAcMBVNvZmlhMA8GA1UECwwIQ2hhaXJtYW4wEgYDVQQJDAs2IEd1cmtvIHN0cjAcBgkqhkiG9w0BCQEWD3Zib3poa292QGNyYy5iZzAcBgoJkiaJk/IsZAEZFg5jcmMtbWVtYmVycy1jYTArBgNVBAoMJENvbW11bmljYXRpb25zIFJlZ3VsYXRpb24gQ29tbWlzc2lvbjAvBgNVBAMMKNCS0LXRgdC10LvQuNC9INCR0L7QttC60L7QsiDQkdC+0LbQutC+0LIwggEjMA0GCSqGSIb3DQEBAQUAA4IBEAAwggELAoIBAQCKnw+xckNqW++OppSxnAqaSHILSgT8cR1t7vN4/4lS/kyOzsmyilRHP3MqdduPnx6bAl/oW4lxxU0scHK4qyPJM8RPqvcMNsM5Vlyp8+q5ytZQvbuWBsbHENZ68Nyj0dtaSsZWxaho1JYvE7feTUMQaAIxJ5HCSfij9nHP0PP9XA53MOpKZ+H7NNsBe2t4PFa2MaK5LuS54HYROofSrx6j0LRre0p3T3D/4ZfRH62k2IGikAvS9iK93e9u7GcS8ozNtObDys5AXMyJylgg7gvPccUAAC3tbHERyGp+7tDhRr7qsNgD8jKLVEIIQHgWzm3oA51p1Xppro0MPz4hkhI3AgQAqnrBo4IBWzCCAVcwDgYDVR0PAQH/BAQDAgbAMBEGA1UdJQQKMAgGBgQAkTcDADAkBggrBgEFBQcBAwQYMBYwFAYIKwYBBQUHCwEwCAYGBACORgEBMH8GA1UdIAR4MHYwdAYJKwYBBAH/FAECMGcwNwYIKwYBBQUHAgEWK2h0dHA6Ly93d3cuY3JjLmJnL2ZpbGVzL19iZy9tZW1iZXJzLWNhLmh0bWwwLAYIKwYBBQUHAgIwIBoeQ1JDIFRTTCBTaWduaW5nIENlcnRpZmljYXRlIENQMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly93d3cuZWdvdi5iZy9jcmwvY3JjLW1lbWJlcnMtY2EuY3JsMA8GA1UdEwEB/wQFMAMBAQAwHQYDVR0OBBYEFGKuRxwBsTCtBlelS0n99RamUm2/MB8GA1UdIwQYMBaAFAkINvmsvi5j6+G+YL3jm5fJ4lE4MA0GCSqGSIb3DQEBBQUAA4IBAQBnBn/q6hgNLO2RcQZ5BnYPYhG81/lcua8T6Um7lmO4JLP+BXhmFexheR24Hs6RpgDpTwNq4aWb3Juh5GMqtWALIGOMbbegQHQ4Sa0nrVcWsUVStI9oOv8LpRfrECKYHNLjNnVliOa9dYfHcWX5aFuDc78DlBp7HwPX7L1UbK0zMRIlm4dqNfAHGvUrv7pDa1j2etRMCxO9c6Fzzh7fMYJ+/1MP6nu7bz554jCFuz5Q+VVq3m7EyGT2TbGi/m2zCF2gWke6OJamhRf8Fy3dYIS3EDampRsaiNG32Qz3ZKyyRwb6QI9IZouy9zCMKwgDeXiXZP+r1WowMO9QRkmepCGd</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIFWDCCBECgAwIBAgIJAIW0w8KGYDu+MA0GCSqGSIb3DQEBBQUAMIGHMYGEMAkGA1UEBgwCQkcwFQYDVQQDDA5DUkMgTWVtYmVycyBDQTAVBgNVBAsMDkNSQyBNZW1iZXJzIENBMBwGCgmSJomT8ixkARkWDmNyYy1tZW1iZXJzLWNhMCsGA1UECgwkQ29tbXVuaWNhdGlvbnMgUmVndWxhdGlvbiBDb21taXNzaW9uMB4XDTE0MDkwNDEwMDExNFoXDTE5MDkwNDEwMDExNFowge8xgewwCQYDVQQGDAJCRzALBgNVBBEMBDEwMDAwDAYDVQQHDAVTb2ZpYTARBgNVBAsMCkNSQyBNZW1iZXIwEgYDVQQJDAs2IEd1cmtvIHN0cjAcBgoJkiaJk/IsZAEZFg5jcmMtbWVtYmVycy1jYTAdBgkqhkiG9w0BCQEWEGlyb21hbnNrYUBjcmMuYmcwKwYDVQQKDCRDb21tdW5pY2F0aW9ucyBSZWd1bGF0aW9uIENvbW1pc3Npb24wMwYDVQQDDCzQmNGA0LjQvdCwINCh0YLQsNC90YfQtdCy0LAg0KDQvtC80LDQvdGB0LrQsDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALeau49s8E/Amx+zQnH76Vkep/eOntMOpFVKYp2KxhMX8p9pJ0N6iJgJs7DiPSbkqVQ1LnG8+Dj9Z0BQiPgh8Sg7EIxmCf6YVcmWc14naYxYzMqCwbBz3Uu5xOzfE8/0WIyGHQHpHa5DZk8bZBuyKICfGOoKrL1SlCHZ3pkXawPLyyupBjvInRBY3dCfPRDOq6XZVCJKwaQoWhiPYtjB3pgiWlU5Hd7RbiSh2EaV2vVdLvoQ5rb71FdnWUgiW4zjc+2KtoWnWQ0RBTfWCQL6XJgBdXyBA5d9ONUQRfbWKeyq1+9vMXR2H9arW5QD/Sra59NaN6ZaS4WWc6n7NrLhdU8CAwEAAaOCAVswggFXMA4GA1UdDwEB/wQEAwIGwDARBgNVHSUECjAIBgYEAJE3AwAwJAYIKwYBBQUHAQMEGDAWMBQGCCsGAQUFBwsBMAgGBgQAjkYBATB/BgNVHSAEeDB2MHQGCSsGAQQB/xQBAjBnMDcGCCsGAQUFBwIBFitodHRwOi8vd3d3LmNyYy5iZy9maWxlcy9fYmcvbWVtYmVycy1jYS5odG1sMCwGCCsGAQUFBwICMCAaHkNSQyBUU0wgU2lnbmluZyBDZXJ0aWZpY2F0ZSBDUDA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vd3d3LmVnb3YuYmcvY3JsL2NyYy1tZW1iZXJzLWNhLmNybDAPBgNVHRMBAf8EBTADAQEAMB0GA1UdDgQWBBRTRU7qRNyUTqcHzCscgHucWf61qjAfBgNVHSMEGDAWgBQJCDb5rL4uY+vhvmC945uXyeJRODANBgkqhkiG9w0BAQUFAAOCAQEAB3/B1OoF3Pm9fqgEmD1ug7+f8IeGYaRDQWKa3ieFm1Dl6VypydHilogYgFtUjvcOTJYi+INb0HglfOxoqx64RzzEleCSSz2tp5IlL0aKylMqv8Zoe/zPE5Qow7ZEx0M6vHRi8nM0v3RmzeMORdiFQWyvoNuJmPLtTO/UFC3DbabWozmNjGN8/OV8VOyLr637YEP6UpILbvPt9VVn3aC7Ll0SoxRH7kcfiCQ+RJYhB2DJVhvXnOXw1Jzeuyu9a8AVUrb2Aaw9sK3tSWQbCZeg1rxsMuEYpFUqM982ClVCAWG/X04S4DYthY1U9RDE1fGNzKKs/XtzdhiZTXtlW5jyFA==</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://crc.bg/files/_bg/TSL-CRC-BG-signed.pdf</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>BG</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/pdf</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Communications Regulation Commission</Name> -+ <Name xml:lang="bg">Комисия за регулиране на съобщенията</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/BG</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIFUTCCBDmgAwIBAgIIM7DFMDyB1XwwDQYJKoZIhvcNAQEFBQAwgYcxgYQwCQYDVQQGDAJCRzAVBgNVBAMMDkNSQyBNZW1iZXJzIENBMBUGA1UECwwOQ1JDIE1lbWJlcnMgQ0EwHAYKCZImiZPyLGQBGRYOY3JjLW1lbWJlcnMtY2EwKwYDVQQKDCRDb21tdW5pY2F0aW9ucyBSZWd1bGF0aW9uIENvbW1pc3Npb24wHhcNMTIxMTE1MTEyODA1WhcNMTcxMTE1MTEyODA1WjCB6DGB5TAJBgNVBAYMAkJHMAsGA1UEEQwEMTAwMDAMBgNVBAcMBVNvZmlhMA8GA1UECwwIQ2hhaXJtYW4wEgYDVQQJDAs2IEd1cmtvIHN0cjAcBgkqhkiG9w0BCQEWD3Zib3poa292QGNyYy5iZzAcBgoJkiaJk/IsZAEZFg5jcmMtbWVtYmVycy1jYTArBgNVBAoMJENvbW11bmljYXRpb25zIFJlZ3VsYXRpb24gQ29tbWlzc2lvbjAvBgNVBAMMKNCS0LXRgdC10LvQuNC9INCR0L7QttC60L7QsiDQkdC+0LbQutC+0LIwggEjMA0GCSqGSIb3DQEBAQUAA4IBEAAwggELAoIBAQCKnw+xckNqW++OppSxnAqaSHILSgT8cR1t7vN4/4lS/kyOzsmyilRHP3MqdduPnx6bAl/oW4lxxU0scHK4qyPJM8RPqvcMNsM5Vlyp8+q5ytZQvbuWBsbHENZ68Nyj0dtaSsZWxaho1JYvE7feTUMQaAIxJ5HCSfij9nHP0PP9XA53MOpKZ+H7NNsBe2t4PFa2MaK5LuS54HYROofSrx6j0LRre0p3T3D/4ZfRH62k2IGikAvS9iK93e9u7GcS8ozNtObDys5AXMyJylgg7gvPccUAAC3tbHERyGp+7tDhRr7qsNgD8jKLVEIIQHgWzm3oA51p1Xppro0MPz4hkhI3AgQAqnrBo4IBWzCCAVcwDgYDVR0PAQH/BAQDAgbAMBEGA1UdJQQKMAgGBgQAkTcDADAkBggrBgEFBQcBAwQYMBYwFAYIKwYBBQUHCwEwCAYGBACORgEBMH8GA1UdIAR4MHYwdAYJKwYBBAH/FAECMGcwNwYIKwYBBQUHAgEWK2h0dHA6Ly93d3cuY3JjLmJnL2ZpbGVzL19iZy9tZW1iZXJzLWNhLmh0bWwwLAYIKwYBBQUHAgIwIBoeQ1JDIFRTTCBTaWduaW5nIENlcnRpZmljYXRlIENQMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly93d3cuZWdvdi5iZy9jcmwvY3JjLW1lbWJlcnMtY2EuY3JsMA8GA1UdEwEB/wQFMAMBAQAwHQYDVR0OBBYEFGKuRxwBsTCtBlelS0n99RamUm2/MB8GA1UdIwQYMBaAFAkINvmsvi5j6+G+YL3jm5fJ4lE4MA0GCSqGSIb3DQEBBQUAA4IBAQBnBn/q6hgNLO2RcQZ5BnYPYhG81/lcua8T6Um7lmO4JLP+BXhmFexheR24Hs6RpgDpTwNq4aWb3Juh5GMqtWALIGOMbbegQHQ4Sa0nrVcWsUVStI9oOv8LpRfrECKYHNLjNnVliOa9dYfHcWX5aFuDc78DlBp7HwPX7L1UbK0zMRIlm4dqNfAHGvUrv7pDa1j2etRMCxO9c6Fzzh7fMYJ+/1MP6nu7bz554jCFuz5Q+VVq3m7EyGT2TbGi/m2zCF2gWke6OJamhRf8Fy3dYIS3EDampRsaiNG32Qz3ZKyyRwb6QI9IZouy9zCMKwgDeXiXZP+r1WowMO9QRkmepCGd</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIFWDCCBECgAwIBAgIJAIW0w8KGYDu+MA0GCSqGSIb3DQEBBQUAMIGHMYGEMAkGA1UEBgwCQkcwFQYDVQQDDA5DUkMgTWVtYmVycyBDQTAVBgNVBAsMDkNSQyBNZW1iZXJzIENBMBwGCgmSJomT8ixkARkWDmNyYy1tZW1iZXJzLWNhMCsGA1UECgwkQ29tbXVuaWNhdGlvbnMgUmVndWxhdGlvbiBDb21taXNzaW9uMB4XDTE0MDkwNDEwMDExNFoXDTE5MDkwNDEwMDExNFowge8xgewwCQYDVQQGDAJCRzALBgNVBBEMBDEwMDAwDAYDVQQHDAVTb2ZpYTARBgNVBAsMCkNSQyBNZW1iZXIwEgYDVQQJDAs2IEd1cmtvIHN0cjAcBgoJkiaJk/IsZAEZFg5jcmMtbWVtYmVycy1jYTAdBgkqhkiG9w0BCQEWEGlyb21hbnNrYUBjcmMuYmcwKwYDVQQKDCRDb21tdW5pY2F0aW9ucyBSZWd1bGF0aW9uIENvbW1pc3Npb24wMwYDVQQDDCzQmNGA0LjQvdCwINCh0YLQsNC90YfQtdCy0LAg0KDQvtC80LDQvdGB0LrQsDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALeau49s8E/Amx+zQnH76Vkep/eOntMOpFVKYp2KxhMX8p9pJ0N6iJgJs7DiPSbkqVQ1LnG8+Dj9Z0BQiPgh8Sg7EIxmCf6YVcmWc14naYxYzMqCwbBz3Uu5xOzfE8/0WIyGHQHpHa5DZk8bZBuyKICfGOoKrL1SlCHZ3pkXawPLyyupBjvInRBY3dCfPRDOq6XZVCJKwaQoWhiPYtjB3pgiWlU5Hd7RbiSh2EaV2vVdLvoQ5rb71FdnWUgiW4zjc+2KtoWnWQ0RBTfWCQL6XJgBdXyBA5d9ONUQRfbWKeyq1+9vMXR2H9arW5QD/Sra59NaN6ZaS4WWc6n7NrLhdU8CAwEAAaOCAVswggFXMA4GA1UdDwEB/wQEAwIGwDARBgNVHSUECjAIBgYEAJE3AwAwJAYIKwYBBQUHAQMEGDAWMBQGCCsGAQUFBwsBMAgGBgQAjkYBATB/BgNVHSAEeDB2MHQGCSsGAQQB/xQBAjBnMDcGCCsGAQUFBwIBFitodHRwOi8vd3d3LmNyYy5iZy9maWxlcy9fYmcvbWVtYmVycy1jYS5odG1sMCwGCCsGAQUFBwICMCAaHkNSQyBUU0wgU2lnbmluZyBDZXJ0aWZpY2F0ZSBDUDA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vd3d3LmVnb3YuYmcvY3JsL2NyYy1tZW1iZXJzLWNhLmNybDAPBgNVHRMBAf8EBTADAQEAMB0GA1UdDgQWBBRTRU7qRNyUTqcHzCscgHucWf61qjAfBgNVHSMEGDAWgBQJCDb5rL4uY+vhvmC945uXyeJRODANBgkqhkiG9w0BAQUFAAOCAQEAB3/B1OoF3Pm9fqgEmD1ug7+f8IeGYaRDQWKa3ieFm1Dl6VypydHilogYgFtUjvcOTJYi+INb0HglfOxoqx64RzzEleCSSz2tp5IlL0aKylMqv8Zoe/zPE5Qow7ZEx0M6vHRi8nM0v3RmzeMORdiFQWyvoNuJmPLtTO/UFC3DbabWozmNjGN8/OV8VOyLr637YEP6UpILbvPt9VVn3aC7Ll0SoxRH7kcfiCQ+RJYhB2DJVhvXnOXw1Jzeuyu9a8AVUrb2Aaw9sK3tSWQbCZeg1rxsMuEYpFUqM982ClVCAWG/X04S4DYthY1U9RDE1fGNzKKs/XtzdhiZTXtlW5jyFA==</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://crc.bg/files/_bg/TSL-CRC-BG-signed.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>BG</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Communications Regulation Commission</Name> -+ <Name xml:lang="bg">Комисия за регулиране на съобщенията</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/BG</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDeDCCAmCgAwIBAgIFEgFbGzYwDQYJKoZIhvcNAQELBQAwVTELMAkGA1UEBhMCQ1kxMDAuBgNVBAoMJ0RlcGFydG1lbnQgb2YgRWxlY3Ryb25pYyBDb21tdW5pY2F0aW9uczEUMBIGA1UEAwwLVFNMIFNpZ25lcjIwHhcNMTQwNzAxMDAwMDAwWhcNMTgwNzAxMDAwMDAwWjBVMQswCQYDVQQGEwJDWTEwMC4GA1UECgwnRGVwYXJ0bWVudCBvZiBFbGVjdHJvbmljIENvbW11bmljYXRpb25zMRQwEgYDVQQDDAtUU0wgU2lnbmVyMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM2l0vZRrFtdWArytp3quq29byXDB/GbUbm6xKlB63bhyh/SxGDvxDx3PGt1T4b8a89bC0RnmeRpgGRGWwNON2xKnMcDzMYmCi4cmNS7IrTF6GhVbpgLXCsx5JOU+oz0BXE2ASlF3h/r6AuT3oUzGapacNX4LhKtjU8MCuES0xU/V3x0H/FCOu1ziwfnt7wv29wGm39y8h5CTkiAmKxoZThJT49EBnwnBTA09v+5q+qROABNQGYbVkrwyym5hbYEIxHfA5pRMd/QBJhUGL6HhYZQpgzIXjYCaH5+c4U1LqOJoPehW8uocesSnAvpE1lx3JyXkYclBCKO9jVE5UA1c4kCAwEAAaNPME0wHQYDVR0OBBYEFAfjuk4G4S9SC/QxPyHuCFHrN5KaMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgbAMBEGA1UdIAQKMAgwBgYEVR0gADANBgkqhkiG9w0BAQsFAAOCAQEAjj+4NRRsV840YvUwC2BwiqdvySnaJaDgjSx0+TQjEcpQhffDIsDTV2kZpz8rERzcQnf/W0IYXZ4XvHjjCgPocZp8lcKC8V2bK506C9vdMP7s0aiTQT2Xx8g2V89Z71mM7KFh2aNIHGfjbOZbzlG3aW/qPlQ0LtL7gKLc4LdBbhBbig1b7fCmuk29yAnxRNZ59ql+oCx9bT2axZf0E0BVsp503pVG5g872e+UUAZvc4vAYSFSY4d/wTr4fd1+Oiaq7GuIMdkaM5rdue9Eo5wib9TVG4OWtzTcx8Dgz3UT+lXmkW787EmZpVfnhD1L/SSo8V21uNXpq+qNC9bPkqWyYQ==</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDizCCAnOgAwIBAgIFEuB6lFUwDQYJKoZIhvcNAQELBQAwVTELMAkGA1UEBhMCQ1kxMDAuBgNVBAoMJ0RlcGFydG1lbnQgb2YgRWxlY3Ryb25pYyBDb21tdW5pY2F0aW9uczEUMBIGA1UEAwwLVFNMIFNpZ25lcjEwHhcNMTQwMTAxMDAwMDAwWhcNMTgwMTAxMDAwMDAwWjBVMQswCQYDVQQGEwJDWTEwMC4GA1UECgwnRGVwYXJ0bWVudCBvZiBFbGVjdHJvbmljIENvbW11bmljYXRpb25zMRQwEgYDVQQDDAtUU0wgU2lnbmVyMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALgqtGqEzoVJC/xkzkYImpQE659JKIhlBfqHd0k59JGppdretL//imQPAccnauds6+VKVnDJnbGFZfyfsSXHR8BWUVdko8ih8gHUQSarPkQC1XxSegybrClx19+TNJKlQulaUFPFifU4RQWl34uzmCHdDqlswGiT4rxTMvvsiWELJ0xEEaZ6LiKPnFZYjJ8rwqkTiaVL6r+cfmmoQexzVhbeU2nVeQME6vlsmrIOD42X/9P5/380eTCaASLNxrO1iRiF0LhD5NwucexryYPs+TAPh2Lz+URSCKNygu4lJsG3TFvNkiSYoJHojcGg43Qf3v0aLk54d83xHFyMwnRsUY8CAwEAAaNiMGAwHQYDVR0OBBYEFPTmzt/K3ZC/RRr3CNowzdpCOqJlMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgbAMBEGA1UdIAQKMAgwBgYEVR0gADARBgNVHSUECjAIBgYEAJE3AwAwDQYJKoZIhvcNAQELBQADggEBABkEtoDdOZaE7l+mjihOhmUAfpCv/zxj7wdlno0IvNhCvAfUSP5b5oBJ30LdyerUPBH/ZQdPJoRKthUG7QDePxcRb9rNK84cCRFtM3RpLgfgOAAjUUvvo0MZFf0D3Fj3PP/Jq+/SdHrm1X9j2adG3JCSuVEl7Wp9TZ8rm1isE3+DlQyP1rHzT0gEwpg4YF0pI0vB8nUzHN6JqFu0FAQphA2zuuceIblNDkmljx4vtRUfEQEv9EIbh72j9QN1fObDi/rd8LutAsxxGLRDMJv9WC1uSmEo6pwJ4Vme0mx3uaxNL/Dbpb/SjXJdLrKtHMLKntGvOP6NvrmTr55mIPkaoWk=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://www.mcw.gov.cy/mcw/dec/dec.nsf/all/B28C11BBFDBAC045C2257E0D002937E9/$file/TSL-CY-sign.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>CY</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Department of Electronic Communications</Name> -+ <Name xml:lang="el">Τμήμα Ηλεκτρονικών Επικοινωνιών</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/CY</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIFqDCCBJCgAwIBAgIEAKhcEzANBgkqhkiG9w0BAQsFADCBtzELMAkGA1UEBhMCQ1oxOjA4BgNVBAMMMUkuQ0EgLSBRdWFsaWZpZWQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHksIDA5LzIwMDkxLTArBgNVBAoMJFBydm7DrSBjZXJ0aWZpa2HEjW7DrSBhdXRvcml0YSwgYS5zLjE9MDsGA1UECww0SS5DQSAtIEFjY3JlZGl0ZWQgUHJvdmlkZXIgb2YgQ2VydGlmaWNhdGlvbiBTZXJ2aWNlczAeFw0xNTA2MDMxMTI4NTZaFw0xNjA2MDIxMTI4NTZaMH4xCzAJBgNVBAYTAkNaMR0wGwYDVQQDDBRJbmcuIFJhZG9tw61yIMWgaW1lazE3MDUGA1UECgwuTWluaXN0cnkgb2YgdGhlIEludGVyaW9yIG9mIHRoZSBDemVjaCBSZXB1YmxpYzEXMBUGA1UEBRMOSUNBIC0gMTAzNDQ4MjEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCawspfUgMcHE6NKJmbpUU0o3e1+qJPJnw7MMd/c+aSummSNw8DnoYrsjQmC7Iii1U4JIytzlYwJ/uOkvT7XG3z7dkkl9395RC8gVMnarGOIrkDbRo5PbzKUfKa92faFvbnn2uvHPZDIreEdHvX35hR4BOdaeH29gSmSzBhDvZ4xnH6uFyh/SX5cIv/5QJRHz399ZlfA4K9cZG2aAMJzh968ctQqxL7jjAmMI3Re2GZFLHO9J5dYkFmcHgty1Qp/PYUV473m2V8Y3nZi1imi9gSVxuERMjM+0BOUHWd1pyGCcqSSMN86jqNESJFW31fzR7fstd08UG5MPRj0/m8NpfRAgMBAAGjggHyMIIB7jARBgNVHSUECjAIBgYEAJE3AwAwgd8GA1UdIASB1zCB1DCB0QYNKwYBBAGBuEgBAR4DATCBvzCBvAYIKwYBBQUHAgIwga8agaxUZW50byBrdmFsaWZpa292YW55IGNlcnRpZmlrYXQgamUgdnlkYW4gcG9kbGUgemFrb25hIENlc2tlIHJlcHVibGlreSBjLiAyMjcvMjAwMCBTYi4gdiBwbGF0bmVtIHpuZW5pL1RoaXMgaXMgcXVhbGlmaWVkIGNlcnRpZmljYXRlIGFjY29yZGluZyB0byBDemVjaCBBY3QgTm8uIDIyNy8yMDAwIENvbGwuMIGBBgNVHR8EejB4MCagJKAihiBodHRwOi8vcWNybGRwMS5pY2EuY3ovcWljYTA5LmNybDAmoCSgIoYgaHR0cDovL3FjcmxkcDIuaWNhLmN6L3FpY2EwOS5jcmwwJqAkoCKGIGh0dHA6Ly9xY3JsZHAzLmljYS5jei9xaWNhMDkuY3JsMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgZAMBgGCCsGAQUFBwEDBAwwCjAIBgYEAI5GAQEwHwYDVR0jBBgwFoAUecvQI+k6Z3CRdE/TUeLgIP3hKPswHQYDVR0OBBYEFC6CFzYHEofr962LdU1w+xy0PFJXMA0GCSqGSIb3DQEBCwUAA4IBAQCB2lBGEdViXN7Q3r5voDGlZGE4kzeK3+eXLlyDIFEPrRV/MeIN5+Rtk7MCWZmHUbbzFoJzsqvBG5yBY5uNlhJZZ4Ee7xrHykrxpCx4CrD+hkqLNeaI+IocTxMG/4y0adaEx7ooVZH7+elE+0WVIBzPPuWH298zVrdS6LKNAjodqFWK8R84lLZPjh+lFHciznwgaKOz+JKvBuBQYznP1DAvQ21Cspe6lB9XpVQA9O0mwoCiXD6buW1COz2MGwMLwn6k/eJKfEqWzOa8cdYm2GpdxAAnU9XE1aLnbjHBBlAf6uZ+/YOV8JgiDEOCCVmnt9aPZZmX8HIqh8FxC5ykQ46T</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIFDzCCA/egAwIBAgIBATANBgkqhkiG9w0BAQsFADCBtjELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlByYWd1ZTE3MDUGA1UEChMuTWluaXN0cnkgb2YgdGhlIEludGVyaW9yIG9mIHRoZSBDemVjaCBSZXB1YmxpYzE3MDUGA1UEAxMuTWluaXN0cnkgb2YgdGhlIEludGVyaW9yIG9mIHRoZSBDemVjaCBSZXB1YmxpYzEkMCIGCSqGSIb3DQEJARYVcmFkb21pci5zaW1la0BtdmNyLmN6MB4XDTE0MDMwMTA1MjAwMFoXDTE5MDMwMTA1MjAwMFowgbYxCzAJBgNVBAYTAkNaMQ8wDQYDVQQHEwZQcmFndWUxNzA1BgNVBAoTLk1pbmlzdHJ5IG9mIHRoZSBJbnRlcmlvciBvZiB0aGUgQ3plY2ggUmVwdWJsaWMxNzA1BgNVBAMTLk1pbmlzdHJ5IG9mIHRoZSBJbnRlcmlvciBvZiB0aGUgQ3plY2ggUmVwdWJsaWMxJDAiBgkqhkiG9w0BCQEWFXJhZG9taXIuc2ltZWtAbXZjci5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO3PmohbCGpwe/1BnjkOsTnULvFONX0/hUAFi7wJ4xSK9cShj2OLxJEa56tIdD7UBz5PMqsEhaGTH20/7qkT92uk/F+sZdveVbEha5VlVyAVGvO2ReVCC0e7NxJqyNVGzyFxIFfcIAO2aTQpu1+kAGRmPoqES+7zO9J2L1s5C0H8fzvCNEEA9k0aBigstyxrlWE3odzLXDlAYTT5fcMIZkuAOe7dbK4yOFDZpe/5yCG4PdiD021NIVjA/vm2t092uEcBzqIcaeziusWMn2EAACD7d9wkP538j5htpldsSFUPgatc2rkv96vk9gwPdR0IxUsUaEhxjGuN+p6h3puoFxECAwEAAaOCASQwggEgMAkGA1UdEwQCMAAwHQYDVR0OBBYEFFGuBukXCJgG9hD9xpOCmxGMW4BoMIHjBgNVHSMEgdswgdiAFFGuBukXCJgG9hD9xpOCmxGMW4BooYG8pIG5MIG2MQswCQYDVQQGEwJDWjEPMA0GA1UEBxMGUHJhZ3VlMTcwNQYDVQQKEy5NaW5pc3RyeSBvZiB0aGUgSW50ZXJpb3Igb2YgdGhlIEN6ZWNoIFJlcHVibGljMTcwNQYDVQQDEy5NaW5pc3RyeSBvZiB0aGUgSW50ZXJpb3Igb2YgdGhlIEN6ZWNoIFJlcHVibGljMSQwIgYJKoZIhvcNAQkBFhVyYWRvbWlyLnNpbWVrQG12Y3IuY3qCAQEwDgYDVR0PAQH/BAQDAgZAMA0GCSqGSIb3DQEBCwUAA4IBAQDS9g+4r+i0yu3dHp1L3K8nrdexpw9qTOgiNpydf2uDHltlnRVgXuyn38KBhyI89uDYILN32owBbMuygu04sehRB/sfcWMpeWbH7KAneShUaZijpD4UiUdoLHROEoxhC9hCH2Ygu4phZN4Wk+xIQ9LtiAIQsjdncIrUPd0+NGsAdedClDw9rjwAatohAHUTQEHzFolL7KVzj2ZtmeguR5t+QBeRchgoL4u5zE7B4uaH/zA00AKI1p5oVPekF29PGA0PVmj1BuLb5q845tNDVrprxjL8lcvVTobt6MVDAogwsnxPwY8V9cnWg1qxqeU72FIRbwy4EgkbpAHayyk9xAU1</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://tsl.gov.cz/publ/TSL_CZ.pdf</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>CZ</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/pdf</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Ministry of the Interior of the Czech Republic</Name> -+ <Name xml:lang="cs">Ministerstvo vnitra České republiky</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/CZ</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIFqDCCBJCgAwIBAgIEAKhcEzANBgkqhkiG9w0BAQsFADCBtzELMAkGA1UEBhMCQ1oxOjA4BgNVBAMMMUkuQ0EgLSBRdWFsaWZpZWQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHksIDA5LzIwMDkxLTArBgNVBAoMJFBydm7DrSBjZXJ0aWZpa2HEjW7DrSBhdXRvcml0YSwgYS5zLjE9MDsGA1UECww0SS5DQSAtIEFjY3JlZGl0ZWQgUHJvdmlkZXIgb2YgQ2VydGlmaWNhdGlvbiBTZXJ2aWNlczAeFw0xNTA2MDMxMTI4NTZaFw0xNjA2MDIxMTI4NTZaMH4xCzAJBgNVBAYTAkNaMR0wGwYDVQQDDBRJbmcuIFJhZG9tw61yIMWgaW1lazE3MDUGA1UECgwuTWluaXN0cnkgb2YgdGhlIEludGVyaW9yIG9mIHRoZSBDemVjaCBSZXB1YmxpYzEXMBUGA1UEBRMOSUNBIC0gMTAzNDQ4MjEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCawspfUgMcHE6NKJmbpUU0o3e1+qJPJnw7MMd/c+aSummSNw8DnoYrsjQmC7Iii1U4JIytzlYwJ/uOkvT7XG3z7dkkl9395RC8gVMnarGOIrkDbRo5PbzKUfKa92faFvbnn2uvHPZDIreEdHvX35hR4BOdaeH29gSmSzBhDvZ4xnH6uFyh/SX5cIv/5QJRHz399ZlfA4K9cZG2aAMJzh968ctQqxL7jjAmMI3Re2GZFLHO9J5dYkFmcHgty1Qp/PYUV473m2V8Y3nZi1imi9gSVxuERMjM+0BOUHWd1pyGCcqSSMN86jqNESJFW31fzR7fstd08UG5MPRj0/m8NpfRAgMBAAGjggHyMIIB7jARBgNVHSUECjAIBgYEAJE3AwAwgd8GA1UdIASB1zCB1DCB0QYNKwYBBAGBuEgBAR4DATCBvzCBvAYIKwYBBQUHAgIwga8agaxUZW50byBrdmFsaWZpa292YW55IGNlcnRpZmlrYXQgamUgdnlkYW4gcG9kbGUgemFrb25hIENlc2tlIHJlcHVibGlreSBjLiAyMjcvMjAwMCBTYi4gdiBwbGF0bmVtIHpuZW5pL1RoaXMgaXMgcXVhbGlmaWVkIGNlcnRpZmljYXRlIGFjY29yZGluZyB0byBDemVjaCBBY3QgTm8uIDIyNy8yMDAwIENvbGwuMIGBBgNVHR8EejB4MCagJKAihiBodHRwOi8vcWNybGRwMS5pY2EuY3ovcWljYTA5LmNybDAmoCSgIoYgaHR0cDovL3FjcmxkcDIuaWNhLmN6L3FpY2EwOS5jcmwwJqAkoCKGIGh0dHA6Ly9xY3JsZHAzLmljYS5jei9xaWNhMDkuY3JsMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgZAMBgGCCsGAQUFBwEDBAwwCjAIBgYEAI5GAQEwHwYDVR0jBBgwFoAUecvQI+k6Z3CRdE/TUeLgIP3hKPswHQYDVR0OBBYEFC6CFzYHEofr962LdU1w+xy0PFJXMA0GCSqGSIb3DQEBCwUAA4IBAQCB2lBGEdViXN7Q3r5voDGlZGE4kzeK3+eXLlyDIFEPrRV/MeIN5+Rtk7MCWZmHUbbzFoJzsqvBG5yBY5uNlhJZZ4Ee7xrHykrxpCx4CrD+hkqLNeaI+IocTxMG/4y0adaEx7ooVZH7+elE+0WVIBzPPuWH298zVrdS6LKNAjodqFWK8R84lLZPjh+lFHciznwgaKOz+JKvBuBQYznP1DAvQ21Cspe6lB9XpVQA9O0mwoCiXD6buW1COz2MGwMLwn6k/eJKfEqWzOa8cdYm2GpdxAAnU9XE1aLnbjHBBlAf6uZ+/YOV8JgiDEOCCVmnt9aPZZmX8HIqh8FxC5ykQ46T</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIFDzCCA/egAwIBAgIBATANBgkqhkiG9w0BAQsFADCBtjELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlByYWd1ZTE3MDUGA1UEChMuTWluaXN0cnkgb2YgdGhlIEludGVyaW9yIG9mIHRoZSBDemVjaCBSZXB1YmxpYzE3MDUGA1UEAxMuTWluaXN0cnkgb2YgdGhlIEludGVyaW9yIG9mIHRoZSBDemVjaCBSZXB1YmxpYzEkMCIGCSqGSIb3DQEJARYVcmFkb21pci5zaW1la0BtdmNyLmN6MB4XDTE0MDMwMTA1MjAwMFoXDTE5MDMwMTA1MjAwMFowgbYxCzAJBgNVBAYTAkNaMQ8wDQYDVQQHEwZQcmFndWUxNzA1BgNVBAoTLk1pbmlzdHJ5IG9mIHRoZSBJbnRlcmlvciBvZiB0aGUgQ3plY2ggUmVwdWJsaWMxNzA1BgNVBAMTLk1pbmlzdHJ5IG9mIHRoZSBJbnRlcmlvciBvZiB0aGUgQ3plY2ggUmVwdWJsaWMxJDAiBgkqhkiG9w0BCQEWFXJhZG9taXIuc2ltZWtAbXZjci5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO3PmohbCGpwe/1BnjkOsTnULvFONX0/hUAFi7wJ4xSK9cShj2OLxJEa56tIdD7UBz5PMqsEhaGTH20/7qkT92uk/F+sZdveVbEha5VlVyAVGvO2ReVCC0e7NxJqyNVGzyFxIFfcIAO2aTQpu1+kAGRmPoqES+7zO9J2L1s5C0H8fzvCNEEA9k0aBigstyxrlWE3odzLXDlAYTT5fcMIZkuAOe7dbK4yOFDZpe/5yCG4PdiD021NIVjA/vm2t092uEcBzqIcaeziusWMn2EAACD7d9wkP538j5htpldsSFUPgatc2rkv96vk9gwPdR0IxUsUaEhxjGuN+p6h3puoFxECAwEAAaOCASQwggEgMAkGA1UdEwQCMAAwHQYDVR0OBBYEFFGuBukXCJgG9hD9xpOCmxGMW4BoMIHjBgNVHSMEgdswgdiAFFGuBukXCJgG9hD9xpOCmxGMW4BooYG8pIG5MIG2MQswCQYDVQQGEwJDWjEPMA0GA1UEBxMGUHJhZ3VlMTcwNQYDVQQKEy5NaW5pc3RyeSBvZiB0aGUgSW50ZXJpb3Igb2YgdGhlIEN6ZWNoIFJlcHVibGljMTcwNQYDVQQDEy5NaW5pc3RyeSBvZiB0aGUgSW50ZXJpb3Igb2YgdGhlIEN6ZWNoIFJlcHVibGljMSQwIgYJKoZIhvcNAQkBFhVyYWRvbWlyLnNpbWVrQG12Y3IuY3qCAQEwDgYDVR0PAQH/BAQDAgZAMA0GCSqGSIb3DQEBCwUAA4IBAQDS9g+4r+i0yu3dHp1L3K8nrdexpw9qTOgiNpydf2uDHltlnRVgXuyn38KBhyI89uDYILN32owBbMuygu04sehRB/sfcWMpeWbH7KAneShUaZijpD4UiUdoLHROEoxhC9hCH2Ygu4phZN4Wk+xIQ9LtiAIQsjdncIrUPd0+NGsAdedClDw9rjwAatohAHUTQEHzFolL7KVzj2ZtmeguR5t+QBeRchgoL4u5zE7B4uaH/zA00AKI1p5oVPekF29PGA0PVmj1BuLb5q845tNDVrprxjL8lcvVTobt6MVDAogwsnxPwY8V9cnWg1qxqeU72FIRbwy4EgkbpAHayyk9xAU1</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://tsl.gov.cz/publ/TSL_CZ.xtsl</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>CZ</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Ministry of the Interior of the Czech Republic</Name> -+ <Name xml:lang="cs">Ministerstvo vnitra České republiky</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/CZ</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIECjCCAvKgAwIBAgICBH8wDQYJKoZIhvcNAQENBQAwPzELMAkGA1UEBhMCREUxGjAYBgNVBAoMEUJ1bmRlc25ldHphZ2VudHVyMRQwEgYDVQQDDAsxNFItQ0EgMTpQTjAeFw0xNDA0MTEwODQ0NTJaFw0xOTA0MTEwNjM1MDBaMEAxCzAJBgNVBAYTAkRFMRowGAYDVQQKDBFCdW5kZXNuZXR6YWdlbnR1cjEVMBMGA1UEAwwMMTRSLVRTTCAxOlBOMIIBIzANBgkqhkiG9w0BAQEFAAOCARAAMIIBCwKCAQEAkyyMPdtWEDtPcT+eq+KKYaQ5G+6Hbpl9i6b3nBN6+3DROzqaVqtehrCpuE5CmUdqR2lixvHTbEjYIlk3jsmPTxtImfZ66mwKUoenulI6jE5/lvRNtqKWQbLTd7nrEJAecy/ouHWZ6xiDB/ytftxJhAREUqGPfJiWnCFoyRrDSW6GQ8QQbJnlHMLuxs30KNUIRbVOOX/jb8oeqFI0zXUeSH/AMrshRM3G8W941tee8nn5jK2CZvjOuYEI1hNpcXAzBTuaFRJhLdsvg0SfgW0T6tFhuUbG5eW9wraGOMCNdzfcNnjmFitVrBRtl9yIfyVn2Tgd2DfJ9cHLJGmbTBnUIwIEQAAAgaOCAQwwggEIMA4GA1UdDwEB/wQEAwIGQDAdBgNVHQ4EFgQUYqVd8yHV7CHE+JCq3zLhvyLM43wwEQYDVR0lBAowCAYGBACRNwMAMBgGCCsGAQUFBwEDBAwwCjAIBgYEAI5GAQEwHwYDVR0jBBgwFoAU/fNQhDCO7COa9TOy44EH3eTvgK4wSgYIKwYBBQUHAQEEPjA8MDoGCCsGAQUFBzABhi5odHRwOi8vb2NzcC5ucmNhLWRzLmRlOjgwODAvb2NzcC1vY3NwcmVzcG9uZGVyMBIGA1UdIAQLMAkwBwYFKyQIAQEwGwYJKwYBBAHAbQMFBA4wDAYKKwYBBAHAbQMFATAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBDQUAA4IBAQAMm2Fj5hoZBOeOOT4LPrky39cTYMPN1+Patx6BB+kuF/pXAI/GmDyOuFIZ+/Sf8bz336sbbIfnbDeV6Y6ZJvCnqzrUT8kBlf3+QTQ+JxOEYfw1bdRffjmYDCbM0S7Rw02eAaSykiHSkSp8kWA6rYWkhVakX/v/PdBUtkPHdq1P5ghLPx7Gk/ax/U3fDLlKGms5iJjz55AIMqlK4HWEc7xZk3QoD8w+lpRqT5QNYwex5ueXO/Mpd9ZtY5qm7bJKhRnKejQaaMO1frAWT+QM2Uve3TaZlgupa0K+FL9i532dMd/D4RjxtDTNfa5o8gcNFS6eDyuo0z8BJDp9LCLtNZYT</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIECjCCAvKgAwIBAgICBM4wDQYJKoZIhvcNAQENBQAwPzELMAkGA1UEBhMCREUxGjAYBgNVBAoMEUJ1bmRlc25ldHphZ2VudHVyMRQwEgYDVQQDDAsxNFItQ0EgMTpQTjAeFw0xNDEyMDUwOTM5MDZaFw0xOTEyMDQyMzU5NTlaMEAxCzAJBgNVBAYTAkRFMRowGAYDVQQKDBFCdW5kZXNuZXR6YWdlbnR1cjEVMBMGA1UEAwwMMTRSLVRTTCAyOlBOMIIBIzANBgkqhkiG9w0BAQEFAAOCARAAMIIBCwKCAQEAsGI5qje99nNG7TKA7ebNH5LLJHns8wJN+2fiqXajL8Vn6ss/PRjnmZMZmZCEIjPiqZ44ClfFZfMG4i5FuQtQgy1QNoLvbGWXe4E7E8/QJrVgZDn3fWzXQijvSH1SDXF/yhNU/9/WirHuf0VuvXPQBOQNlboOII4jxdUq3hqIknzZ1RGSDw1OQkd/kiiN01DRqnIFOXGr9C8aYC/LFsT8bMyY1YwhkrsFjt5bEcTSTnp+W2ee3nizifEAivH5RINPqdMcGIZ0jt60n2eSNUwP5WiBODBxgGJz4v+/lRrKqGznS/vnTO/WfUGYsjphjY0zb+7aUfhEKLI8jOI0zZmmTwIEQAAAgaOCAQwwggEIMA4GA1UdDwEB/wQEAwIGQDAdBgNVHQ4EFgQUSKX4OarEbho7M1SjSBICi99U1EowEQYDVR0lBAowCAYGBACRNwMAMBgGCCsGAQUFBwEDBAwwCjAIBgYEAI5GAQEwHwYDVR0jBBgwFoAU/fNQhDCO7COa9TOy44EH3eTvgK4wSgYIKwYBBQUHAQEEPjA8MDoGCCsGAQUFBzABhi5odHRwOi8vb2NzcC5ucmNhLWRzLmRlOjgwODAvb2NzcC1vY3NwcmVzcG9uZGVyMBIGA1UdIAQLMAkwBwYFKyQIAQEwGwYJKwYBBAHAbQMFBA4wDAYKKwYBBAHAbQMFATAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBDQUAA4IBAQBcDV3Z88953Qg7BXrbGqcGLhD8Bb5TBhN9VAzypzLU65Qev9gyKWLwSR9yxWM/93hiANzRV500dHhEXOmblAuP9nHfmEEgs+wPoPHZlvwpvs5WaIMcsVu2SZHv3cESXZYbDOK1wPA3adqU6TnmHmT43w5F79tFbUoLbHjfxnq9ouQS21rQX3zrwgIfkNwYm0dHrUBlX4Yn1tpVpISYOxyy8XoOMaLIRQqDmTlp28BeGnt7gFicL4oZoy0ZECH1UseMSAWRNB8AGeS+gLssrDySMWwqsnS9XQpNN7co8iqBum3p1fDJ6CYV4qZ5P3iHdOL3ncVf2WP/FDqon3VoQpd1</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>https://www.nrca-ds.de/st/TSL-XML.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>DE</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Federal Network Agency</Name> -+ <Name xml:lang="de">Bundesnetzagentur</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/DE</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://www.digst.dk/~/media/Files/Loesninger-og-infrastruktur/NemID/HumanReadabletldkxml.pdf</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>DK</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/pdf</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Danish Agency for Digitisation // CVR:34051178</Name> -+ <Name xml:lang="da">Digitaliseringsstyrelsen // CVR:34051178</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/DK</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://www.digst.dk/~/media/Files/Loesninger-og-infrastruktur/NemID/TLDK.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>DK</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="da">Digitaliseringsstyrelsen // CVR:34051178</Name> -+ <Name xml:lang="en">Danish Agency for Digitisation // CVR:34051178</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/DK</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDtDCCApygAwIBAgIJAOGr7PilHGMwMA0GCSqGSIb3DQEBBQUAMHExLjAsBgNVBAMTJUVzdG9uaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IxCzAJBgNVBAYTAkVFMTIwMAYDVQQKEylFc3RvbmlhbiBUZWNobmljYWwgU3VydmVpbGxhbmNlIEF1dGhvcml0eTAeFw0xMDEwMjkxMzIyNTBaFw0yMDExMDUxMzIyNTBaMHExLjAsBgNVBAMTJUVzdG9uaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IxCzAJBgNVBAYTAkVFMTIwMAYDVQQKEylFc3RvbmlhbiBUZWNobmljYWwgU3VydmVpbGxhbmNlIEF1dGhvcml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALhdQ9c33Y98JC0pl34+rg+qXLgdjEQaBM9gpxOpIpeqwrcXi5xbLmh4mk6imennbRaZXgJRqrOkx77B+UsBwn6uPgeZenJ1kFGvAOR9aePbgxJ5AggMr4wJXSa03OSGDhptsmMFc86qtnht94mDf1UCn1CNYA7qQHzu4MQwqJ2Ist7IIki89VZD5I4Y5AItMKlEjnHAOw/dlMfI8SxE2vvxCIyQu+rhfGPfwotHi0POyKtkX9Y+JSqEVqRXNw7B2x+d9mRYUJ8EqDvj5ag9dtgyXLsfJ4HdUJMqvoT6QnfwlBbaFusTm3R8SNVXl/8LHDoM5naOSKAOGRSe2OnxAJ8CAwEAAaNPME0wDAYDVR0TBAUwAwIBADALBgNVHQ8EBAMCB4AwHQYDVR0OBBYEFAon+QooAKxPsgZlsTxvK/8synsxMBEGA1UdJQQKMAgGBgQAkTcDADANBgkqhkiG9w0BAQUFAAOCAQEACansBzvd2iwBlZg50oueEtUlFyE+do+FmI4apydq2bM3kdeikWGERSbV1EzD86j7jpNKEOvlPTkV7fZl+7uCJ3OuCrzHEzuaZnvFPkN7Rmj4P1AGh5UK4UVWJwTceuhzIf4D6+/5CNY6U8iEHIqvAmTVOPSKEvxdBv7GKHy6x897icQa8ttHq+xCLmc0+6zpbzSZ5dOmFG3kzJuZPqtqa89Lqf7x6IRRKgUd+C+JsKDMjEde/eYnM8yxdVlzEWe6Z0qKVvPTuiCnhTNhaaQM3aiw61RMTes2Ik4wSGY75XZjQV5gVszHJBEntktcduGWCuJ24qS2lb1M2/8bE43Fkg==</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDvjCCAqagAwIBAgIJAMx8n7ZaTrHwMA0GCSqGSIb3DQEBBQUAMHYxMzAxBgNVBAMTKkVzdG9uaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IgMjAxNDELMAkGA1UEBhMCRUUxMjAwBgNVBAoTKUVzdG9uaWFuIFRlY2huaWNhbCBTdXJ2ZWlsbGFuY2UgQXV0aG9yaXR5MB4XDTE0MDQxNzA4MTUzOFoXDTI0MDQyNDA4MTUzOFowdjEzMDEGA1UEAxMqRXN0b25pYW4gVHJ1c3RlZCBMaXN0IFNjaGVtZSBPcGVyYXRvciAyMDE0MQswCQYDVQQGEwJFRTEyMDAGA1UEChMpRXN0b25pYW4gVGVjaG5pY2FsIFN1cnZlaWxsYW5jZSBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8iDN5MzWga97Mz6eQFjCsk2en4g8ujRUQemyIc/nJ3LDSTu0ZWXLksZAoHtHwPAgHafU70nUeAUZ25Wl/jk6SyX2wY29Wka97/mWgFCb5H066T1KI+euQf6R0jhsSqGNaZrhUrs0G4jRzjcQ303YT1JiJVMh9hdGVj5KrVsGymXZh0zYrp237AWlcvxNBeiYlskASaEKbRuEpEdw4jeK0nVvfPfDj3XkLfRvX9QXRikRlPyzMKzFf7bXJRQ90hWI9IqMUP0RkvDSqqrteYV0wB8GKEaDMnqjvEXuhhoGtqusm5K3F5no+cUiY7JsalTzs3MACJSTwjZrCSxAeKr5DAgMBAAGjTzBNMAwGA1UdEwQFMAMCAQAwCwYDVR0PBAQDAgeAMB0GA1UdDgQWBBRXB3a0i0xYnYUj4nzNK/pwBrmORTARBgNVHSUECjAIBgYEAJE3AwAwDQYJKoZIhvcNAQEFBQADggEBAGoHM4yIlIXt8CxNLe1sNxymcJyB8oJbvJwlwCUvapaJieVCSQMmtIrn+3uAAdhMijZSQWPB+5DsLWk7ewyridr2bs+UOc0uJ+ay7zrHIj/g+YDIA0DQ7L6JYabiXNJlQhPNm1LxJ9UZSt+h5anl+nSUSV/C2HQgjtgw1Sm6vYf4/EGGaYGAwOvPPOcaYKbcvcpiKkNhhl+nnfAw/RSz4X5Ow5UWNqDsNSv/xIbuw8vORLn6FcYxVScCFAQQGLl4CYQ9IFyQhsvk7xbOCpD09hd4dqvoPHCRkNjuJt9MBO169WlAL6J+coJ2Xo9JxCgfAU2HI7iGbsAnBj4jdHaa+sI=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://sr.riik.ee/tsl/estonian-tsl.pdf</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>EE</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/pdf</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Estonian Technical Surveillance Authority</Name> -+ <Name xml:lang="et">Tehnilise Järelevalve Amet</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EE</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDtDCCApygAwIBAgIJAOGr7PilHGMwMA0GCSqGSIb3DQEBBQUAMHExLjAsBgNVBAMTJUVzdG9uaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IxCzAJBgNVBAYTAkVFMTIwMAYDVQQKEylFc3RvbmlhbiBUZWNobmljYWwgU3VydmVpbGxhbmNlIEF1dGhvcml0eTAeFw0xMDEwMjkxMzIyNTBaFw0yMDExMDUxMzIyNTBaMHExLjAsBgNVBAMTJUVzdG9uaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IxCzAJBgNVBAYTAkVFMTIwMAYDVQQKEylFc3RvbmlhbiBUZWNobmljYWwgU3VydmVpbGxhbmNlIEF1dGhvcml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALhdQ9c33Y98JC0pl34+rg+qXLgdjEQaBM9gpxOpIpeqwrcXi5xbLmh4mk6imennbRaZXgJRqrOkx77B+UsBwn6uPgeZenJ1kFGvAOR9aePbgxJ5AggMr4wJXSa03OSGDhptsmMFc86qtnht94mDf1UCn1CNYA7qQHzu4MQwqJ2Ist7IIki89VZD5I4Y5AItMKlEjnHAOw/dlMfI8SxE2vvxCIyQu+rhfGPfwotHi0POyKtkX9Y+JSqEVqRXNw7B2x+d9mRYUJ8EqDvj5ag9dtgyXLsfJ4HdUJMqvoT6QnfwlBbaFusTm3R8SNVXl/8LHDoM5naOSKAOGRSe2OnxAJ8CAwEAAaNPME0wDAYDVR0TBAUwAwIBADALBgNVHQ8EBAMCB4AwHQYDVR0OBBYEFAon+QooAKxPsgZlsTxvK/8synsxMBEGA1UdJQQKMAgGBgQAkTcDADANBgkqhkiG9w0BAQUFAAOCAQEACansBzvd2iwBlZg50oueEtUlFyE+do+FmI4apydq2bM3kdeikWGERSbV1EzD86j7jpNKEOvlPTkV7fZl+7uCJ3OuCrzHEzuaZnvFPkN7Rmj4P1AGh5UK4UVWJwTceuhzIf4D6+/5CNY6U8iEHIqvAmTVOPSKEvxdBv7GKHy6x897icQa8ttHq+xCLmc0+6zpbzSZ5dOmFG3kzJuZPqtqa89Lqf7x6IRRKgUd+C+JsKDMjEde/eYnM8yxdVlzEWe6Z0qKVvPTuiCnhTNhaaQM3aiw61RMTes2Ik4wSGY75XZjQV5gVszHJBEntktcduGWCuJ24qS2lb1M2/8bE43Fkg==</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDvjCCAqagAwIBAgIJAMx8n7ZaTrHwMA0GCSqGSIb3DQEBBQUAMHYxMzAxBgNVBAMTKkVzdG9uaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IgMjAxNDELMAkGA1UEBhMCRUUxMjAwBgNVBAoTKUVzdG9uaWFuIFRlY2huaWNhbCBTdXJ2ZWlsbGFuY2UgQXV0aG9yaXR5MB4XDTE0MDQxNzA4MTUzOFoXDTI0MDQyNDA4MTUzOFowdjEzMDEGA1UEAxMqRXN0b25pYW4gVHJ1c3RlZCBMaXN0IFNjaGVtZSBPcGVyYXRvciAyMDE0MQswCQYDVQQGEwJFRTEyMDAGA1UEChMpRXN0b25pYW4gVGVjaG5pY2FsIFN1cnZlaWxsYW5jZSBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8iDN5MzWga97Mz6eQFjCsk2en4g8ujRUQemyIc/nJ3LDSTu0ZWXLksZAoHtHwPAgHafU70nUeAUZ25Wl/jk6SyX2wY29Wka97/mWgFCb5H066T1KI+euQf6R0jhsSqGNaZrhUrs0G4jRzjcQ303YT1JiJVMh9hdGVj5KrVsGymXZh0zYrp237AWlcvxNBeiYlskASaEKbRuEpEdw4jeK0nVvfPfDj3XkLfRvX9QXRikRlPyzMKzFf7bXJRQ90hWI9IqMUP0RkvDSqqrteYV0wB8GKEaDMnqjvEXuhhoGtqusm5K3F5no+cUiY7JsalTzs3MACJSTwjZrCSxAeKr5DAgMBAAGjTzBNMAwGA1UdEwQFMAMCAQAwCwYDVR0PBAQDAgeAMB0GA1UdDgQWBBRXB3a0i0xYnYUj4nzNK/pwBrmORTARBgNVHSUECjAIBgYEAJE3AwAwDQYJKoZIhvcNAQEFBQADggEBAGoHM4yIlIXt8CxNLe1sNxymcJyB8oJbvJwlwCUvapaJieVCSQMmtIrn+3uAAdhMijZSQWPB+5DsLWk7ewyridr2bs+UOc0uJ+ay7zrHIj/g+YDIA0DQ7L6JYabiXNJlQhPNm1LxJ9UZSt+h5anl+nSUSV/C2HQgjtgw1Sm6vYf4/EGGaYGAwOvPPOcaYKbcvcpiKkNhhl+nnfAw/RSz4X5Ow5UWNqDsNSv/xIbuw8vORLn6FcYxVScCFAQQGLl4CYQ9IFyQhsvk7xbOCpD09hd4dqvoPHCRkNjuJt9MBO169WlAL6J+coJ2Xo9JxCgfAU2HI7iGbsAnBj4jdHaa+sI=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://sr.riik.ee/tsl/estonian-tsl.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>EE</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Estonian Technical Surveillance Authority</Name> -+ <Name xml:lang="et">Tehnilise Järelevalve Amet</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EE</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIE4DCCA8igAwIBAgIQKdcXmZiVNv8AQDkUhiQ4ZzANBgkqhkiG9w0BAQUFADCBpTELMAkGA1UEBhMCR1IxPjA8BgNVBAoTNUhlbGxlbmljIFB1YmxpYyBBZG1pbmlzdHJhdGlvbiBDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzMQ8wDQYDVQQLEwZIUEFSQ0ExRTBDBgNVBAMTPEhlbGxlbmljIFB1YmxpYyBBZG1pbmlzdHJhdGlvbiBmb3IgTGVnYWwgRW50aXRpZXMgSXNzdWluZyBDQTAeFw0xNDAxMzEwMDAwMDBaFw0xODAxMzAyMzU5NTlaMH0xCzAJBgNVBAYTAkdSMQ8wDQYDVQQHFAZBVEhFTlMxDTALBgNVBAoUBEVFVFQxDTALBgNVBAsUBEVFVFQxPzA9BgNVBAMTNkhlbGxlbmljIFRlbGVjb21tdW5pY2F0aW9ucyBhbmQgUG9zdCBDb21taXNzaW9uIC0gRUVUVDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKTC8BJGIWKJwAyeRt5v3WFyRJr6VKeo4hRH1S1dbS/kNHOCkEaCQVRJuds61oaiAJmXdCtkNZrMJZ/YSzg7LZ7/M+EW5z1rOirTr7CPUxOVYzCnQrD1gaylWMPI6+CErA867UqnOTkuRckN5P0YoFvxUvrnqMWU0SgI2Fu5F1Hn93rwaOpcteYUx4gLDTgr8g6ply1alVTeWXEtNgSaqW/dGrWTduyDSXHiKurkjnDBA+Dabw51FAWY2R/MaFHtCN3nSaxoeaoCxsy5vQxQrrZOlwvV9wnEkLXaTxzZdRKgETt+3om4ZjAR5fC4CgtXHSV7tXM+u5bN2YtxXneWT6kCAwEAAaOCATEwggEtMAkGA1UdEwQCMAAwUQYDVR0gBEowSDBGBgwqgiwAhtsxAQcBAQcwNjA0BggrBgEFBQcCARYoaHR0cHM6Ly9wa2kuZXJtaXMuZ292LmdyL3JlcG9zaXRvcnkuaHRtbDBKBgNVHR8EQzBBMD+gPaA7hjlodHRwOi8vY3JsLmVybWlzLmdvdi5nci9IUEFSQ0FMZWdhbEVudGl0aWVzL0xhdGVzdENSTC5jcmwwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBRScfRlSOyeduHtAYfzQN1Zstj2OTAfBgNVHSMEGDAWgBSEy+4igJ4tSDdTGxIHcx5vM3I7zTA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmVybWlzLmdvdi5ncjANBgkqhkiG9w0BAQUFAAOCAQEAKlHY+QHXmBMib/6iBOBQR7D/mWWvhMQCJaM69aLaXi9FHFEu2KrWFCaGh+ade92xzvhSYlMtTMDydActvyygV5etWLLBTi2YFuUFsU9niFdRSZ9ZF0LME+DcGnD8G5M9ThiLkQNMBfLX1zfrIEgGMMP8ADEGmngzdZThz984p2kTIJNDUkPhgnTNoUZs5DROxQP+NUkTw+9y5VcgSZnTWu65NXPh3Hqtq4CX/xwgomcQN31fySct63gU7HGNkXRjPvSekGOSpKuAYabTUWtGFP2YhuAJ6p2cmGzTqQuDJeilsMS7NxB/3fCOEGK8Huk9LpcGB7LVmczDrp/Q76ub8A==</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIFJDCCBAygAwIBAgIQBPWIMN+uUlymArA205cJETANBgkqhkiG9w0BAQUFADCBpTELMAkGA1UEBhMCR1IxPjA8BgNVBAoTNUhlbGxlbmljIFB1YmxpYyBBZG1pbmlzdHJhdGlvbiBDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzMQ8wDQYDVQQLEwZIUEFSQ0ExRTBDBgNVBAMTPEhlbGxlbmljIFB1YmxpYyBBZG1pbmlzdHJhdGlvbiBmb3IgTGVnYWwgRW50aXRpZXMgSXNzdWluZyBDQTAeFw0xNDAzMTAwMDAwMDBaFw0xODAzMDkyMzU5NTlaMIGtMQswCQYDVQQGEwJHUjEPMA0GA1UEBxQGQVRIRU5TMT4wPAYDVQQKFDVIZWxsZW5pYyBUZWxlY29tbXVuaWNhdGlvbnMgYW5kIFBvc3QgQ29tbWlzc2lvbiwgRUVUVDENMAsGA1UECxQERUVUVDE+MDwGA1UEAxM1SGVsbGVuaWMgVGVsZWNvbW11bmljYXRpb25zIGFuZCBQb3N0IENvbW1pc3Npb24sIEVFVFQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDEcOAZE/t7SLkBwZCkhNiniAwJJyWADBCaceNMp5FV01jHhT5bFq0wECrQgIcNrCQq+z1KHBF/Zej7jhNWBO0ByKt2Y/3dB/YP9KNaJL9oAMg2/DacOehunHmeit1jXKteyV8dsf2obojUvvUGzd2/wpx0z0muSZPSMpgBsaHZOuctbjYFEhsIth1g+gIW+2hQ91QW+h+/Xo4olfLDwbEsyZh1u9cvROweXUITD7PfoJkpWyEoJYBQkODWqXJz7oTZYb+P7wIWNDoY4JCFGd+U14fKUb6qEkZQ+6nvm0/bUn0ezarQFEwKsXHcyu9q75/KKDZboFpo88r023920i0JAgMBAAGjggFEMIIBQDAJBgNVHRMEAjAAMFEGA1UdIARKMEgwRgYMKoIsAIbbMQEHAQEHMDYwNAYIKwYBBQUHAgEWKGh0dHBzOi8vcGtpLmVybWlzLmdvdi5nci9yZXBvc2l0b3J5Lmh0bWwwSgYDVR0fBEMwQTA/oD2gO4Y5aHR0cDovL2NybC5lcm1pcy5nb3YuZ3IvSFBBUkNBTGVnYWxFbnRpdGllcy9MYXRlc3RDUkwuY3JsMAsGA1UdDwQEAwIHgDAdBgNVHQ4EFgQUReYYDjHx2MVXPQrpZJXx5dsPDBowHwYDVR0jBBgwFoAUhMvuIoCeLUg3UxsSB3MebzNyO80wEQYDVR0lBAowCAYGBACRNwMAMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZXJtaXMuZ292LmdyMA0GCSqGSIb3DQEBBQUAA4IBAQBDaJ4ZYEdYU8keyGvMQYUUjfhx7k/zXwXqLgqWoORZN2aGvaDUtf/k/JhJ/xm+WnEIyKtEwtqKYf1dVS8nMY0fLpu/1cGx1qMzp8tEG3EJBls5Z2OPMoWBLE5mra1m2R8442ekWp6tSy7zoaa3xXtnUxB0Dvt1iVLHODtJcxUNKrl9nmu0ujficaSeEhprpAye917j6xVDtzLXFbGSAeNmGzVjUf+uo8ZQ6Q1F2aLjRyavy+Ph5bBwcKQ7DUocwn6gRJAqfmUJwy4H1vIqrrtaHbqVOpmgrjwZNcu3pimAOw4cd6uJThAx1acKCr2He4hii1Nxt1+SYmdIDD6WYfDt</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>https://www.eett.gr/tsl/EL-TSL.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>EL</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Hellenic Telecommunications and Post Commission, EETT</Name> -+ <Name xml:lang="el">Εθνική Επιτροπή Τηλεπικοινωνιών και Ταχυδρομείων - EETT</Name> -+ <Name xml:lang="el">EETT</Name> -+ <Name xml:lang="en">EETT</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EL</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDyzCCArOgAwIBAgIJAL6B32RxtXxMMA0GCSqGSIb3DQEBCwUAMH4xKzApBgNVBAMTIlNQQU5JU0ggVFJVU1QgTElTVCBTQ0hFTUUgT1BFUkFUT1IxCzAJBgNVBAYTAkVTMTIwMAYDVQQKEylNSU5JU1RFUklPIERFIElORFVTVFJJQSBFTkVSR0lBIFkgVFVSSVNNTzEOMAwGA1UECxMFU0VUU0kwHhcNMTQwMzExMTIzMjUyWhcNMTkwMzExMTIzMjUyWjB+MSswKQYDVQQDEyJTUEFOSVNIIFRSVVNUIExJU1QgU0NIRU1FIE9QRVJBVE9SMQswCQYDVQQGEwJFUzEyMDAGA1UEChMpTUlOSVNURVJJTyBERSBJTkRVU1RSSUEgRU5FUkdJQSBZIFRVUklTTU8xDjAMBgNVBAsTBVNFVFNJMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAocIbYfDYGdw239aAMo08eEfZvn4ACaaYkHLd80Flq6ecAk/aDuwEnmldiBv8yTNdw9/ZqsIy+x0wB09a+9lZDDyq7dCqP8CYZzJW+hYPN4IhqRLDypVxYIKUHu4TYOmAIKhEnUOnY/OrpAtErhFMaA3IwmgMSaJ8vaxop/KcSnKlx+KazoEaPV+yIX6xeCtCzghq0hjjqU0Hlg9+hyna0TRo6K4ars7MceWl1ameMaBiRbAhxINnoEvLEuOx79/kafGNLDAP0ThGhbK9q7hEBylydzY+wVLgM5yCYZdcLllHkt5Fr2zxNU8FH2Jnl+83qbdZDPFYb+HMWZfhHNkz8QIDAQABo0wwSjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIGQDAdBgNVHQ4EFgQUNab+5BisBkvbZfGGr5bY9s0pxT4wEQYDVR0lBAowCAYGBACRNwMAMA0GCSqGSIb3DQEBCwUAA4IBAQCQNx9/TYPACsgOJzBx06EcOHnvslBilvlMghtaQLygoatFTpaeX0JqFuYAZhfGF28k8eC3ENxUYPa30Zh4ZWRm0QlmLjBKBB/z3jJQIq7b0kqf6H8Vb/vvvSNsoWBwnWzv9X8t9D+S9TK5844dCtSvhlkTBlJYXZ+N9cbz0rk6GELzwY33VOSygcj0hyib4+Xb8dxX15omjVS+qk3FyWCq3DPibwKzD5irJL7EfRFkDoWwRVzaaeDCOJqFWeIpfY7/NocB1fbkvx7wMFzZ9xAFgPLirxi6ZVu0YKoDQq95HnvEzDMdoBUdAK+WtS1a3zJIjNAqb6YE9w4cbPpUXWUs</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDyzCCArOgAwIBAgIJAKWF81P5BqylMA0GCSqGSIb3DQEBCwUAMH4xKzApBgNVBAMTIlNQQU5JU0ggVFJVU1QgTElTVCBTQ0hFTUUgT1BFUkFUT1IxCzAJBgNVBAYTAkVTMTIwMAYDVQQKEylNSU5JU1RFUklPIERFIElORFVTVFJJQSBFTkVSR0lBIFkgVFVSSVNNTzEOMAwGA1UECxMFU0VUU0kwHhcNMTQwOTExMTEzODEyWhcNMTkwOTExMTEzODEyWjB+MSswKQYDVQQDEyJTUEFOSVNIIFRSVVNUIExJU1QgU0NIRU1FIE9QRVJBVE9SMQswCQYDVQQGEwJFUzEyMDAGA1UEChMpTUlOSVNURVJJTyBERSBJTkRVU1RSSUEgRU5FUkdJQSBZIFRVUklTTU8xDjAMBgNVBAsTBVNFVFNJMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3Tk6ThJZ/uBAqg8c0PWtC+xl8XQ4RyELaZSwcbaBJlyr/dj288QWjIBtOz+kZgEM7mINlTNW4/FVHNeJfY8dzUBdkhTccx7W3yK720U83DZp+OhBS47+T4/6krQPZ2uMhPI+U7sf7qcOVJ0AjxF2vrrFqTzm1pJ8TE1ys482b8s0o3A9ugLR28UcQhhUUPA2hMkEwzIY9TL1Umrip2XtlJT3N1IOKTMQpiqTJL5laF6WWVRtcTv461uePiohd9ZhBjOXstcaEczCOFeE7Zh6l9uSCwW78ool8b2VezEh5ZDaGv/iSxxPIoiOkd5/9yElqy3JLagJKs8LpTp33WvGhQIDAQABo0wwSjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIGQDAdBgNVHQ4EFgQUkh8fb5AKQbc7caUcVmmK7FH1vUwwEQYDVR0lBAowCAYGBACRNwMAMA0GCSqGSIb3DQEBCwUAA4IBAQDJjFeyy4YBakY61DvbuuCb6FlrIhSbNPH2/o7fX4Ve+G+2WRJOEkE1dIezvnVyOvNnym66rngcZXQDoFMPK5SOQm4nNXrUDd5rWM3c84sHba7UuEdVgC9ZW0YR44/9bVxIHOBSXUDcWbUu6nVStZpNy/Gn11iEIRSU4TsE8YJK5cjZ/xaigYDt01BlLu34v60JoClwlbHeuPgHhUwPyGD8sD4g9+QQhsouv8pG9gbT5+KttS63jB/SmrWLAJOmg97WI/2jkSObJ8zwn0jVJdZtBGbiN2I3+wv1F+FvRZH4jdpE2P7aimucx5iMng+o/dKzFGThn5DwVa5pvplf8IEs</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>https://sede.minetur.gob.es/Prestadores/TSL/TSL.pdf</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>ES</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/pdf</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">MINISTRY OF INDUSTRY ENERGY AND TOURISM</Name> -+ <Name xml:lang="es">MINISTERIO DE INDUSTRIA ENERGIA Y TURISMO</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/ES</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDyzCCArOgAwIBAgIJAL6B32RxtXxMMA0GCSqGSIb3DQEBCwUAMH4xKzApBgNVBAMTIlNQQU5JU0ggVFJVU1QgTElTVCBTQ0hFTUUgT1BFUkFUT1IxCzAJBgNVBAYTAkVTMTIwMAYDVQQKEylNSU5JU1RFUklPIERFIElORFVTVFJJQSBFTkVSR0lBIFkgVFVSSVNNTzEOMAwGA1UECxMFU0VUU0kwHhcNMTQwMzExMTIzMjUyWhcNMTkwMzExMTIzMjUyWjB+MSswKQYDVQQDEyJTUEFOSVNIIFRSVVNUIExJU1QgU0NIRU1FIE9QRVJBVE9SMQswCQYDVQQGEwJFUzEyMDAGA1UEChMpTUlOSVNURVJJTyBERSBJTkRVU1RSSUEgRU5FUkdJQSBZIFRVUklTTU8xDjAMBgNVBAsTBVNFVFNJMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAocIbYfDYGdw239aAMo08eEfZvn4ACaaYkHLd80Flq6ecAk/aDuwEnmldiBv8yTNdw9/ZqsIy+x0wB09a+9lZDDyq7dCqP8CYZzJW+hYPN4IhqRLDypVxYIKUHu4TYOmAIKhEnUOnY/OrpAtErhFMaA3IwmgMSaJ8vaxop/KcSnKlx+KazoEaPV+yIX6xeCtCzghq0hjjqU0Hlg9+hyna0TRo6K4ars7MceWl1ameMaBiRbAhxINnoEvLEuOx79/kafGNLDAP0ThGhbK9q7hEBylydzY+wVLgM5yCYZdcLllHkt5Fr2zxNU8FH2Jnl+83qbdZDPFYb+HMWZfhHNkz8QIDAQABo0wwSjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIGQDAdBgNVHQ4EFgQUNab+5BisBkvbZfGGr5bY9s0pxT4wEQYDVR0lBAowCAYGBACRNwMAMA0GCSqGSIb3DQEBCwUAA4IBAQCQNx9/TYPACsgOJzBx06EcOHnvslBilvlMghtaQLygoatFTpaeX0JqFuYAZhfGF28k8eC3ENxUYPa30Zh4ZWRm0QlmLjBKBB/z3jJQIq7b0kqf6H8Vb/vvvSNsoWBwnWzv9X8t9D+S9TK5844dCtSvhlkTBlJYXZ+N9cbz0rk6GELzwY33VOSygcj0hyib4+Xb8dxX15omjVS+qk3FyWCq3DPibwKzD5irJL7EfRFkDoWwRVzaaeDCOJqFWeIpfY7/NocB1fbkvx7wMFzZ9xAFgPLirxi6ZVu0YKoDQq95HnvEzDMdoBUdAK+WtS1a3zJIjNAqb6YE9w4cbPpUXWUs</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDyzCCArOgAwIBAgIJAKWF81P5BqylMA0GCSqGSIb3DQEBCwUAMH4xKzApBgNVBAMTIlNQQU5JU0ggVFJVU1QgTElTVCBTQ0hFTUUgT1BFUkFUT1IxCzAJBgNVBAYTAkVTMTIwMAYDVQQKEylNSU5JU1RFUklPIERFIElORFVTVFJJQSBFTkVSR0lBIFkgVFVSSVNNTzEOMAwGA1UECxMFU0VUU0kwHhcNMTQwOTExMTEzODEyWhcNMTkwOTExMTEzODEyWjB+MSswKQYDVQQDEyJTUEFOSVNIIFRSVVNUIExJU1QgU0NIRU1FIE9QRVJBVE9SMQswCQYDVQQGEwJFUzEyMDAGA1UEChMpTUlOSVNURVJJTyBERSBJTkRVU1RSSUEgRU5FUkdJQSBZIFRVUklTTU8xDjAMBgNVBAsTBVNFVFNJMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3Tk6ThJZ/uBAqg8c0PWtC+xl8XQ4RyELaZSwcbaBJlyr/dj288QWjIBtOz+kZgEM7mINlTNW4/FVHNeJfY8dzUBdkhTccx7W3yK720U83DZp+OhBS47+T4/6krQPZ2uMhPI+U7sf7qcOVJ0AjxF2vrrFqTzm1pJ8TE1ys482b8s0o3A9ugLR28UcQhhUUPA2hMkEwzIY9TL1Umrip2XtlJT3N1IOKTMQpiqTJL5laF6WWVRtcTv461uePiohd9ZhBjOXstcaEczCOFeE7Zh6l9uSCwW78ool8b2VezEh5ZDaGv/iSxxPIoiOkd5/9yElqy3JLagJKs8LpTp33WvGhQIDAQABo0wwSjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIGQDAdBgNVHQ4EFgQUkh8fb5AKQbc7caUcVmmK7FH1vUwwEQYDVR0lBAowCAYGBACRNwMAMA0GCSqGSIb3DQEBCwUAA4IBAQDJjFeyy4YBakY61DvbuuCb6FlrIhSbNPH2/o7fX4Ve+G+2WRJOEkE1dIezvnVyOvNnym66rngcZXQDoFMPK5SOQm4nNXrUDd5rWM3c84sHba7UuEdVgC9ZW0YR44/9bVxIHOBSXUDcWbUu6nVStZpNy/Gn11iEIRSU4TsE8YJK5cjZ/xaigYDt01BlLu34v60JoClwlbHeuPgHhUwPyGD8sD4g9+QQhsouv8pG9gbT5+KttS63jB/SmrWLAJOmg97WI/2jkSObJ8zwn0jVJdZtBGbiN2I3+wv1F+FvRZH4jdpE2P7aimucx5iMng+o/dKzFGThn5DwVa5pvplf8IEs</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>https://sede.minetur.gob.es/Prestadores/TSL/TSL.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>ES</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">MINISTRY OF INDUSTRY ENERGY AND TOURISM</Name> -+ <Name xml:lang="es">MINISTERIO DE INDUSTRIA ENERGIA Y TURISMO</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/ES</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>https://www.viestintavirasto.fi/attachments/HumanReadable_TSL-Ficora.xml.pdf</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>FI</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/pdf</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Finnish Communications Regulatory Authority</Name> -+ <Name xml:lang="fi">Viestintavirasto</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/FI</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>https://www.viestintavirasto.fi/attachments/TSL-Ficora.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>FI</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Finnish Communications Regulatory Authority</Name> -+ <Name xml:lang="fi">Viestintavirasto</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/FI</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEfjCCA2agAwIBAgISESFFIhi7LsGOut4p3YeL6MH7MA0GCSqGSIb3DQEBCwUAMIGUMQswCQYDVQQGEwJGUjEwMC4GA1UECgwnQWdlbmNlIE5hdGlvbmFsZSBkZXMgVGl0cmVzIFPDqWN1cmlzw6lzMRcwFQYDVQQLEw4wMDAyIDEzMDAwMzI2MjE6MDgGA1UEAwwxQXV0b3JpdMOpIGRlIGNlcnRpZmljYXRpb24gcG9ydGV1ciBBQUUgMyDDqXRvaWxlczAeFw0xNDAzMjYxNTEwMTJaFw0xNzAzMjYxNDEwMTJaMH0xCzAJBgNVBAYTAkZSMS4wLAYDVQQKEyVBZ2VuY2UgTmF0aW9uYWxlIGRlcyBUaXRyZXMgU2VjdXJpc2VzMRcwFQYDVQQLEw4wMDAyIDEzMDAwMzI2MjElMCMGA1UEAxMcTGF1cmVudCBWb2lsbG90IDIzMTAwMDExNTN2bDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKjtrKgkGxUMgxtItb0taMxoKdUFZIo7mUnhuWa5ozlnHvF1QZ+GlrgUCcRZtvMkzRkjzzsduwe3d0pXTXbddjs2CPD5nnyXpVCw0RG9tgBSwSkNMB2BFPDeNoShLNh6GgJ5pYpfPj+Xj4AG9s4wZAPtNBXNoZj25lK85XPbNCwroOXStJVqWryr6A8Wa/IIBui3uxyQcgEhQTK0TmXRsnWOI6YCOhVeQm7Nj8yelWu6j4zqqf9IoFbn8U7YQ+kgRAhZjpUlQBiXRzyCAPYZn/GE7v8xAodEppwpQ3MEwUMul++ENVixJnPhCTK+1DXuk33FC5eh8l3pJsWMfJFWVAECAwEAAaOB3zCB3DAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIGQDAXBgNVHSAEEDAOMAwGCiqBegGBSAIDAQEwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDovL2NybC5hbnRzLmdvdXYuZnIvYW50c3YyL2FjX3BvcnRldXJfYWFlLmNybDAiBggrBgEFBQcBAwQWMBQwCAYGBACORgEBMAgGBgQAjkYBBDAdBgNVHQ4EFgQUO8vG9yPdo2CH7zThOxpkoirLy/IwHwYDVR0jBBgwFoAUrS1vABmDqTgbf4cj78PA932oJUkwDQYJKoZIhvcNAQELBQADggEBAKqCs2JJe0jjmqQUARdsLDAB27S9glO6UHWprnkUG3OoJRRnDewACyo4MTdst2WgB6kAuQ80lMsTGCpRTN4TppbZDvHtcv6QsAV+878m0zdzBfCLp8F9pMxQaQZNFjBD3o0TsGz4plY1KCgHBviSRqwdAT7SqY68XAjMj+e3WhJ0693nEMmurXMpqe2OE1s5Y5BExlxhffImyrhDzry4/V0ZEnAb99DW0zr+WTNZFlkpz9CwZgPWTpuGHagU8/aFCJ2hbrmYZYsPhHMBLbBKfphJ9rrojQmY7SWpvd7ygGIfi9migV7EFMq/v8XyXuwFq1jt7QgturXnb39dgU7MT9A=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://references.modernisation.gouv.fr/sites/default/files/TSL-FR_xml.pdf</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>FR</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/pdf</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Directorate General for State Modernisation</Name> -+ <Name xml:lang="fr">Direction Générale de la Modernisation de l'Etat (DGME )</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/FR</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEfjCCA2agAwIBAgISESFFIhi7LsGOut4p3YeL6MH7MA0GCSqGSIb3DQEBCwUAMIGUMQswCQYDVQQGEwJGUjEwMC4GA1UECgwnQWdlbmNlIE5hdGlvbmFsZSBkZXMgVGl0cmVzIFPDqWN1cmlzw6lzMRcwFQYDVQQLEw4wMDAyIDEzMDAwMzI2MjE6MDgGA1UEAwwxQXV0b3JpdMOpIGRlIGNlcnRpZmljYXRpb24gcG9ydGV1ciBBQUUgMyDDqXRvaWxlczAeFw0xNDAzMjYxNTEwMTJaFw0xNzAzMjYxNDEwMTJaMH0xCzAJBgNVBAYTAkZSMS4wLAYDVQQKEyVBZ2VuY2UgTmF0aW9uYWxlIGRlcyBUaXRyZXMgU2VjdXJpc2VzMRcwFQYDVQQLEw4wMDAyIDEzMDAwMzI2MjElMCMGA1UEAxMcTGF1cmVudCBWb2lsbG90IDIzMTAwMDExNTN2bDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKjtrKgkGxUMgxtItb0taMxoKdUFZIo7mUnhuWa5ozlnHvF1QZ+GlrgUCcRZtvMkzRkjzzsduwe3d0pXTXbddjs2CPD5nnyXpVCw0RG9tgBSwSkNMB2BFPDeNoShLNh6GgJ5pYpfPj+Xj4AG9s4wZAPtNBXNoZj25lK85XPbNCwroOXStJVqWryr6A8Wa/IIBui3uxyQcgEhQTK0TmXRsnWOI6YCOhVeQm7Nj8yelWu6j4zqqf9IoFbn8U7YQ+kgRAhZjpUlQBiXRzyCAPYZn/GE7v8xAodEppwpQ3MEwUMul++ENVixJnPhCTK+1DXuk33FC5eh8l3pJsWMfJFWVAECAwEAAaOB3zCB3DAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIGQDAXBgNVHSAEEDAOMAwGCiqBegGBSAIDAQEwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDovL2NybC5hbnRzLmdvdXYuZnIvYW50c3YyL2FjX3BvcnRldXJfYWFlLmNybDAiBggrBgEFBQcBAwQWMBQwCAYGBACORgEBMAgGBgQAjkYBBDAdBgNVHQ4EFgQUO8vG9yPdo2CH7zThOxpkoirLy/IwHwYDVR0jBBgwFoAUrS1vABmDqTgbf4cj78PA932oJUkwDQYJKoZIhvcNAQELBQADggEBAKqCs2JJe0jjmqQUARdsLDAB27S9glO6UHWprnkUG3OoJRRnDewACyo4MTdst2WgB6kAuQ80lMsTGCpRTN4TppbZDvHtcv6QsAV+878m0zdzBfCLp8F9pMxQaQZNFjBD3o0TsGz4plY1KCgHBviSRqwdAT7SqY68XAjMj+e3WhJ0693nEMmurXMpqe2OE1s5Y5BExlxhffImyrhDzry4/V0ZEnAb99DW0zr+WTNZFlkpz9CwZgPWTpuGHagU8/aFCJ2hbrmYZYsPhHMBLbBKfphJ9rrojQmY7SWpvd7ygGIfi9migV7EFMq/v8XyXuwFq1jt7QgturXnb39dgU7MT9A=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://references.modernisation.gouv.fr/sites/default/files/TSL-FR.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>FR</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Directorate General for State Modernisation</Name> -+ <Name xml:lang="fr">Direction Générale de la Modernisation de l'Etat (DGME )</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/FR</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEzDCCA7SgAwIBAgIEPy+YtjANBgkqhkiG9w0BAQUFADAqMQswCQYDVQQGEwJIUjENMAsGA1UEChMERklOQTEMMAoGA1UECxMDUkRDMB4XDTE1MDcwNjA4NDkwNloXDTE2MTIyMDIxMjQzMFowgYQxCzAJBgNVBAYTAkhSMSIwIAYDVQQKExlNaW5pc3RhcnN0dm8gZ29zcG9kYXJzdHZhMQ8wDQYDVQQHEwZaYWdyZWIxQDAZBgNVBAUTEkhSMjI0MTM0NzI5MDAuMy4xMTAjBgNVBAMTHENyb2F0aWFuIFRydXN0ZWQgTGlzdCBTaWduZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvcLGSL/PPQAG28dGf6M+nyAFfxmYzVgFVkyoRLpR/v0MtGZRon75CxU+hrhC6sWRyT7v1yMafFmWGe7gPx2pDrgyID32GIiCrCVHxFmg5GGaWsYBKFYm4WnAo++rANA7MS8BeZP43c1uJQBRDAWI2ocgqKl9AM4c0UPpFUq59wxzy8VqQTRv1GCSZUk3OjH+JVykiWzdGjYPO3VXYaHz4B2itKwfsMLQu2khqjGUBoIJyP5yekcPwbo0qBYmlAVOl1ImecN9z7UDHlaYcSdSgyPoHr/qhAAtlxSdv/wooJcdfvTWQ6ncCi/y3nTNqOt3LA+ydgNS4P9LGdleIbPzJAgMBAAGjggGdMIIBmTAOBgNVHQ8BAf8EBAMCB4AwEQYDVR0lBAowCAYGBACRNwMAMEsGA1UdIAREMEIwQAYJK3yIUAULCAQCMDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly9yZGMuZmluYS5oci9jcC9hbWR0MV9jcDQtMC5wZGYwgcYGA1UdHwSBvjCBuzBDoEGgP6Q9MDsxCzAJBgNVBAYTAkhSMQ0wCwYDVQQKEwRGSU5BMQwwCgYDVQQLEwNSREMxDzANBgNVBAMTBkNSTDc2NDB0oHKgcIZNbGRhcDovL3JkYy1sZGFwLmZpbmEuaHIvb3U9UkRDLG89RklOQSxjPUhSP2NlcnRpZmljYXRlUmV2b2NhdGlvbkxpc3QlM0JiaW5hcnmGH2h0dHA6Ly9yZGMuZmluYS5oci9jcmxzL3JkYy5jcmwwKwYDVR0QBCQwIoAPMjAxNTA3MDYwODQ5MDZagQ8yMDE2MTIyMDIxMjQzMFowEwYDVR0jBAwwCoAIR0UAbvBXpsAwEQYDVR0OBAoECE+N/2c+OEmXMAkGA1UdEwQCMAAwDQYJKoZIhvcNAQEFBQADggEBAFifLeogwhrxMNKmKhU59mEAH5JRLY9cz0rPA9YjY7Orh/2RmkJF4QyOCw0tNntK+sGqOVG2aac73kPFOM+OFfcACRYcvMpSIf5AZQh+YtF7Gn2yKj8hltGH8SNAFLn8q8YbWd1Lh9xuPXwgVDbbOSqkUO+CkKu3gfdB3cntJYQ6ggf9eEbwNqDrtSE6pdhY9YJQnCmwZlP7VnZGvys55u/awTvbXv/gAfKjVfjHhdo5o7dkOZStkCuUWYk2WNzuUu5R26OI1YI7c/6m9aXcFHsc178CsITO+WSmq/FpKzqG8k1xCfmd38tpiuKL8T/hoSyOhoXjdoGUJ4XIsxqp6DI=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://www.mingo.hr/public/trgovina/TSL-HR.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>HR</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Ministry of the economy</Name> -+ <Name xml:lang="hr">Ministarstvo gospodarstva</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/HR</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEPDCCAySgAwIBAgIEARgHXjANBgkqhkiG9w0BAQsFADCBlDELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MUEwPwYDVQQKDDhOYXRpb25hbCBNZWRpYSBhbmQgSW5mb2NvbW11bmljYXRpb25zIEF1dGhvcml0eSwgSHVuZ2FyeTEvMC0GA1UEAwwmSHVuZ2FyaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IwHhcNMTUwODI0MDkzNzQ3WhcNMTcwMjI0MTAzNzQ3WjCBlDELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MUEwPwYDVQQKDDhOYXRpb25hbCBNZWRpYSBhbmQgSW5mb2NvbW11bmljYXRpb25zIEF1dGhvcml0eSwgSHVuZ2FyeTEvMC0GA1UEAwwmSHVuZ2FyaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCAo4FwCpPc/XcgwXgK+lVlehlXqdOZRPCYgloaoPbVk8UFMszNrSZlnMSORTKBIsHbJLlEE//hrt92XFzbIwMNnm1ZtbMNtBOvin05ziJqXm4DypQ2tHpX9afTp0Q+Xngfi5P8QvMQJ+4641uhBEvUcUY7rDrmCphU4JGk1FboGEL0ONNiGHB17bT03uW9mUQAnrUMZ8D17pg6WYOPPl3FAcQj712RtOl1QwgIql5li2QC73Nwaoz19sna/Crd8JHycYK4zeMcD3DyuG3jbyxeI2NhLauuIj4lBZCFxXmzD7UXPYDsyunWu7hJv99yAf638M0HxWXRIbnBSG5DDaIjAgMBAAGjgZMwgZAwHwYDVR0jBBgwFoAUmiiNX5RgD9JlIjwXD3ht+tCyOM4wHQYDVR0OBBYEFJoojV+UYA/SZSI8Fw94bfrQsjjOMA4GA1UdDwEB/wQEAwIGQDAdBgNVHREEFjAUgRJUTG9wZXJhdG9yQG5taGguaHUwDAYDVR0TAQH/BAIwADARBgNVHSUECjAIBgYEAJE3AwAwDQYJKoZIhvcNAQELBQADggEBAAUQb9qC0NOLg9dadgS+8gVps1YFZrJjDVSAIJesQww+Vc7m2lvE4YoMAEBZMgkepKHgfVyR0DqgRJfFHW4D0jYbb82m+ETgWebmce3ZdFsKdj9m7yvVTvDqfjZ+moyR7Pw8JdTCwNgrYaKNVQu7AzzZpdlZs5gjSbGngUmsL/HUl9iEF+aFCsHT6Qn9J7pwIDNptvOp2sF1YBMtM+O/sR9hWhnTzfmTQK2bzpWNbWO/PAf7UDrHLEGPB5oF2uRR/pcEMR6879lVHUdbEAvRrAEIT9598ohAT4C+YD/Ig1rFl9lzmxJh8fE4wvlEXBjMc2PPDppKWBEusSFhpPLnNqM=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEPDCCAySgAwIBAgIEBYPk+TANBgkqhkiG9w0BAQsFADCBlDELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MUEwPwYDVQQKDDhOYXRpb25hbCBNZWRpYSBhbmQgSW5mb2NvbW11bmljYXRpb25zIEF1dGhvcml0eSwgSHVuZ2FyeTEvMC0GA1UEAwwmSHVuZ2FyaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IwHhcNMTUwODI0MDkzOTAyWhcNMTcwODI0MDkzOTAyWjCBlDELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MUEwPwYDVQQKDDhOYXRpb25hbCBNZWRpYSBhbmQgSW5mb2NvbW11bmljYXRpb25zIEF1dGhvcml0eSwgSHVuZ2FyeTEvMC0GA1UEAwwmSHVuZ2FyaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWMX7RdV8krU56N5reRPnr6ld9qVOxuKI7o2qsbk3dvlEe98kgslGmL6aCXUJP7vtGUtegmjs1JQwzLdeW9CITjIAwDsQdpw6MKDl0Txz9sWFDx0kqu0w+Dn2l2yahYDYYQ/oa5fxRpqd05CH574HJbq5ulTCujKDsEKROhxbtnter37CtQicsYF3vtiaQRxRcXYmwalSRuWnr7SyquKB2nfKXSJTOf3jwbNgc/fUzEHDGaT+gexK8Dbt4VFrXSFBhdTW4rTovdNereMb/t1f+HI6oXcYUABFIVcKoIZJCuAayeuC+xz2QyjvAUKPgfikcSy8Murz4PK6lGNOVQPdLAgMBAAGjgZMwgZAwHwYDVR0jBBgwFoAUW7v+j7zE+s3WH7Y4uB0RhwG9IvUwHQYDVR0OBBYEFFu7/o+8xPrN1h+2OLgdEYcBvSL1MA4GA1UdDwEB/wQEAwIGQDAdBgNVHREEFjAUgRJUTG9wZXJhdG9yQG5taGguaHUwDAYDVR0TAQH/BAIwADARBgNVHSUECjAIBgYEAJE3AwAwDQYJKoZIhvcNAQELBQADggEBAG4YdNbWPF58uKSGQofgjf43IK9bbJazgHz2CQavCWB4o4x/iKNMUYuTI9DY3aHm9DxbT/yxk5jd+dQZfOUFop2Teec72uECicLXvLL4PIMrGZcpzIJXav/JSIngWqnHsdbyMNF/yftTBrJ1cN0HtFQDgPTCRTrnnCrZLfia1J0ItgXCw+q67j1UI+CWv7OXorSUKWZlRarx8EOm9R9nWRrQN2NCV+4JHP5JHrAEXf5QHVXbLiEv/z8ZT/KnBXmz7d6G8LF7emaQq1VIPLL5EpYGAYfha6+ydLR835dHjEuAFqHKYFMhZC2TkmVjFBxrENflRPQr3rhCb22I2YVmKbI=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://www.nmhh.hu/tl/pub/HU_TL.pdf</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>HU</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/pdf</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">National Media and Infocommunications Authority, Hungary</Name> -+ <Name xml:lang="hu">Nemzeti Média- és Hírközlési Hatóság</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/HU</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEPDCCAySgAwIBAgIEARgHXjANBgkqhkiG9w0BAQsFADCBlDELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MUEwPwYDVQQKDDhOYXRpb25hbCBNZWRpYSBhbmQgSW5mb2NvbW11bmljYXRpb25zIEF1dGhvcml0eSwgSHVuZ2FyeTEvMC0GA1UEAwwmSHVuZ2FyaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IwHhcNMTUwODI0MDkzNzQ3WhcNMTcwMjI0MTAzNzQ3WjCBlDELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MUEwPwYDVQQKDDhOYXRpb25hbCBNZWRpYSBhbmQgSW5mb2NvbW11bmljYXRpb25zIEF1dGhvcml0eSwgSHVuZ2FyeTEvMC0GA1UEAwwmSHVuZ2FyaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCAo4FwCpPc/XcgwXgK+lVlehlXqdOZRPCYgloaoPbVk8UFMszNrSZlnMSORTKBIsHbJLlEE//hrt92XFzbIwMNnm1ZtbMNtBOvin05ziJqXm4DypQ2tHpX9afTp0Q+Xngfi5P8QvMQJ+4641uhBEvUcUY7rDrmCphU4JGk1FboGEL0ONNiGHB17bT03uW9mUQAnrUMZ8D17pg6WYOPPl3FAcQj712RtOl1QwgIql5li2QC73Nwaoz19sna/Crd8JHycYK4zeMcD3DyuG3jbyxeI2NhLauuIj4lBZCFxXmzD7UXPYDsyunWu7hJv99yAf638M0HxWXRIbnBSG5DDaIjAgMBAAGjgZMwgZAwHwYDVR0jBBgwFoAUmiiNX5RgD9JlIjwXD3ht+tCyOM4wHQYDVR0OBBYEFJoojV+UYA/SZSI8Fw94bfrQsjjOMA4GA1UdDwEB/wQEAwIGQDAdBgNVHREEFjAUgRJUTG9wZXJhdG9yQG5taGguaHUwDAYDVR0TAQH/BAIwADARBgNVHSUECjAIBgYEAJE3AwAwDQYJKoZIhvcNAQELBQADggEBAAUQb9qC0NOLg9dadgS+8gVps1YFZrJjDVSAIJesQww+Vc7m2lvE4YoMAEBZMgkepKHgfVyR0DqgRJfFHW4D0jYbb82m+ETgWebmce3ZdFsKdj9m7yvVTvDqfjZ+moyR7Pw8JdTCwNgrYaKNVQu7AzzZpdlZs5gjSbGngUmsL/HUl9iEF+aFCsHT6Qn9J7pwIDNptvOp2sF1YBMtM+O/sR9hWhnTzfmTQK2bzpWNbWO/PAf7UDrHLEGPB5oF2uRR/pcEMR6879lVHUdbEAvRrAEIT9598ohAT4C+YD/Ig1rFl9lzmxJh8fE4wvlEXBjMc2PPDppKWBEusSFhpPLnNqM=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEPDCCAySgAwIBAgIEBYPk+TANBgkqhkiG9w0BAQsFADCBlDELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MUEwPwYDVQQKDDhOYXRpb25hbCBNZWRpYSBhbmQgSW5mb2NvbW11bmljYXRpb25zIEF1dGhvcml0eSwgSHVuZ2FyeTEvMC0GA1UEAwwmSHVuZ2FyaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IwHhcNMTUwODI0MDkzOTAyWhcNMTcwODI0MDkzOTAyWjCBlDELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MUEwPwYDVQQKDDhOYXRpb25hbCBNZWRpYSBhbmQgSW5mb2NvbW11bmljYXRpb25zIEF1dGhvcml0eSwgSHVuZ2FyeTEvMC0GA1UEAwwmSHVuZ2FyaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWMX7RdV8krU56N5reRPnr6ld9qVOxuKI7o2qsbk3dvlEe98kgslGmL6aCXUJP7vtGUtegmjs1JQwzLdeW9CITjIAwDsQdpw6MKDl0Txz9sWFDx0kqu0w+Dn2l2yahYDYYQ/oa5fxRpqd05CH574HJbq5ulTCujKDsEKROhxbtnter37CtQicsYF3vtiaQRxRcXYmwalSRuWnr7SyquKB2nfKXSJTOf3jwbNgc/fUzEHDGaT+gexK8Dbt4VFrXSFBhdTW4rTovdNereMb/t1f+HI6oXcYUABFIVcKoIZJCuAayeuC+xz2QyjvAUKPgfikcSy8Murz4PK6lGNOVQPdLAgMBAAGjgZMwgZAwHwYDVR0jBBgwFoAUW7v+j7zE+s3WH7Y4uB0RhwG9IvUwHQYDVR0OBBYEFFu7/o+8xPrN1h+2OLgdEYcBvSL1MA4GA1UdDwEB/wQEAwIGQDAdBgNVHREEFjAUgRJUTG9wZXJhdG9yQG5taGguaHUwDAYDVR0TAQH/BAIwADARBgNVHSUECjAIBgYEAJE3AwAwDQYJKoZIhvcNAQELBQADggEBAG4YdNbWPF58uKSGQofgjf43IK9bbJazgHz2CQavCWB4o4x/iKNMUYuTI9DY3aHm9DxbT/yxk5jd+dQZfOUFop2Teec72uECicLXvLL4PIMrGZcpzIJXav/JSIngWqnHsdbyMNF/yftTBrJ1cN0HtFQDgPTCRTrnnCrZLfia1J0ItgXCw+q67j1UI+CWv7OXorSUKWZlRarx8EOm9R9nWRrQN2NCV+4JHP5JHrAEXf5QHVXbLiEv/z8ZT/KnBXmz7d6G8LF7emaQq1VIPLL5EpYGAYfha6+ydLR835dHjEuAFqHKYFMhZC2TkmVjFBxrENflRPQr3rhCb22I2YVmKbI=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://www.nmhh.hu/tl/pub/HU_TL.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>HU</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">National Media and Infocommunications Authority, Hungary</Name> -+ <Name xml:lang="hu">Nemzeti Média- és Hírközlési Hatóság</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/HU</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIICwTCCAiqgAwIBAgIJAJXDVBeDkXK3MA0GCSqGSIb3DQEBBQUAMHQxCzAJBgNVBAYTAklFMQ8wDQYDVQQHEwZEdWJsaW4xHjAcBgNVBAoTFURlcGFydG1lbnQgb2YgRmluYW5jZTENMAsGA1UECxMEQ01PRDElMCMGA1UEAxMcRXZlbnQgUHVibGlzaGluZyBJbnRlcm5hbCBDQTAeFw0xMDA3MDUxNDI3MjVaFw0yMDA3MDIxNDI3MjVaMFQxCzAJBgNVBAYTAklFMR4wHAYDVQQKExVEZXBhcnRtZW50IG9mIEZpbmFuY2UxDTALBgNVBAsTBENNT0QxFjAUBgNVBAMTDVRhZGdoIE8nTGVhcnkwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAL2eMyRkdde3Brd1N6gh1inG5j8gRbYQ6T/2BwiUlStHEeP/DmKcWKghQKEs6SBMSY/HGZw3ffrqe8tbzDBDeM0Z/F4xgSgYpcVL2QKTtQx4Wv61TESxNH7w5Jc9K2ZpeZz2bAcT2jrFdvBNcwtZ8hNyRsny2xNI8YuvpaZiLw1LAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBTxbALrhi0E0ebV6LpbNTNCvGXorzAfBgNVHSMEGDAWgBRfcPgfLU4sDzxy8r51M+iEDQIcjTANBgkqhkiG9w0BAQUFAAOBgQB4UDYDlveQZFbeN/za2UxQs+RqVZ9u+vT+lG4c+ecxmuFb6vpREjM28WciOAzzJ6hXcXxSZHgYbtVcL6F0JcPBT1HCFGTuHOWlBXzKL4zsuUmMYMPKD+2OojFDmAAvqlsqJT7bWA22EpxRHSf29twbbUuOw04rDAWh6RPDhg7zRg==</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIC5DCCAk2gAwIBAgIJAJXDVBeDkXNiMA0GCSqGSIb3DQEBBQUAMHQxCzAJBgNVBAYTAklFMQ8wDQYDVQQHEwZEdWJsaW4xHjAcBgNVBAoTFURlcGFydG1lbnQgb2YgRmluYW5jZTENMAsGA1UECxMEQ01PRDElMCMGA1UEAxMcRXZlbnQgUHVibGlzaGluZyBJbnRlcm5hbCBDQTAeFw0xNDA2MTYwOTU2MTJaFw0yNDA2MTMwOTU2MTJaMHcxCzAJBgNVBAYTAklFMTQwMgYDVQQKEytEZXBhcnRtZW50IG9mIFB1YmxpYyBFeHBlbmRpdHVyZSBhbmQgUmVmb3JtMRowGAYDVQQLExFHb3Zlcm5tZW50IFJlZm9ybTEWMBQGA1UEAxMNVGFkZ2ggTyBMZWFyeTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0+AtJZLHW+Nkc/Rho8qflL2lEr8OoChQ3nzhiGHSIW/QmpHzzm54mPL6dybLmnpE5/I2lum0c0DohkQKH07Ouz46Lk/AGs7qpRNE14y1WOtbL7JkW5Y7Ktv/gqv8neg77feAUiZNJaQZ2nhIaQi3OyXqwqzEGafzpWsj2BxId2cCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFMVbM3lCFwp+r61i88s1hisafmA+MB8GA1UdIwQYMBaAFF9w+B8tTiwPPHLyvnUz6IQNAhyNMA0GCSqGSIb3DQEBBQUAA4GBAAxyDOqFkdqel1AxOGm04dl87WdBvoew1wxaEp4AhUtk4nAmu7EgmB3scop6Q43hq+dWScvSxWPZAyKUGEmc/qsUnq9NRQGqpB8g9CJKYEC9HHkbNn7b/LbNRdvd49YEfC5qAPgj0SDmQffcahrIGyU2lzZfTW4I00cXn7ogUqu5</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIHZjCCBk6gAwIBAgIEQnrNujANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJJRTEQMA4GA1UEChMHQW4gUG9zdDEYMBYGA1UECxMPUG9zdC5UcnVzdCBMdGQuMSIwIAYDVQQDExlQb3N0LlRydXN0IE9wZXJhdGlvbmFsIENBMB4XDTE0MDYxODEzMjI0NloXDTE3MDYxODEzMjI0NlowgfQxCzAJBgNVBAYTAklFMQ8wDQYDVQQIDAZEdWJsaW4xQjBABgNVBAoMOURlcGFydG1lbnQgb2YgQ29tbXVuaWNhdGlvbnMgRW5lcmd5IGFuZCBOYXR1cmFsIFJlc291cmNlczEeMBwGA1UECwwVUXVhbGlmaWVkIENlcnRpZmljYXRlMTowOAYDVQQLDDFDb21tdW5pY2F0aW9ucyAoQnVzaW5lc3MgYW5kIFRlY2hub2xvZ3kpIERpdmlzaW9uMR4wHAYDVQQFExU5MDQxMTA3Mi9QVDIxMTA1MjEwNDMxFDASBgNVBAMMC1JvcnkgSGluY2h5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyr4qcfKk4GhcoHYRQaLWtDSMBXUttCPLAJiHE52CIgb3wdDcqrSSDOAMdr/ui8v5+HB6/GwabQ0H8OdoQnLoBTFv56NW4u9dlzmR7A5ubvpQ1vKCLJyn+OxlAPmEsal3vrwVgb+r1MaB5STTI0/2Dj90TgPhVZKURj0i+lvLHvwkq2NfYWXaIi+aP1qfAe1PHvFN78vltviL45gomiq6RudbB9+O49uXfIKp/S4SsPt0VCLUrNhkDA6Oux5eUR8+ccKwH7hV+IrGK2t7Y7yfANL3qzObVKpFYVu8jMSmbmiuouU5bGZcU2OJkV1MEHb7/xD2czluzzWW/uj/Uf+v7wIDAQABo4IDlDCCA5AwggHHBgNVHSAEggG+MIIBujCBmAYGBACLMAEBMIGNMIGKBggrBgEFBQcCAjB+DHxJc3N1ZWQgYXMgYSBRdWFsaWZpZWQgQ2VydGlmaWNhdGUgYWNjb3JkaW5nIHRvIEFubmV4IEkgYW5kIElJIG9mIERpcmVjdGl2ZSAxOTk5LzkzL0VDLCBhcyBpbXBsZW1lbnRlZCBpbiB0aGUgbGF3IG9mIElyZWxhbmQuMIIBGwYJKoZIhvcvAQIBMIIBDDCBxQYIKwYBBQUHAgIwgbgMgbVJc3N1ZWQgc3ViamVjdCB0byBQb3N0LlRydXN0IENQUyB0ZXJtcyBhbmQgY29uZGl0aW9ucyB3aGljaCBsaW1pdCB3YXJyYW50aWVzIGFuZCBsaWFiaWxpdHkgb2YgUG9zdC5UcnVzdC4gQnkgYWNjZXB0aW5nLCB0aGUgcmVseWluZyBwYXJ0eSBhY2tub3dsZWRnZXMgaXQgaGFzIHJlYWQgYW5kIGFjY2VwdGVkIGJvdGguMEIGCCsGAQUFBwIBFjZodHRwOi8vd3d3LnBvc3QudHJ1c3QuaWUvZG93bmxvYWRzL3Bvc3R0cnVzdGNkc2Nwcy5wZGYwPQYIKwYBBQUHAQMEMTAvMAgGBgQAjkYBATAWBgYEAI5GAQIwDBMDRVVSAgICewIBAjALBgYEAI5GAQMCAQowSwYKKoZIhvcvAQEJAQQ9MDsCAQGGNmh0dHA6Ly90aW1lc3RhbXAudHJ1c3QuaWUvdHNzLXdlYmNsaWVudC9SZXF1ZXN0SGFuZGxlcjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIGwDARBgNVHSUECjAIBgYEAJE3AwAwdQYDVR0jBG4wbIAITLE1xb0jxdWhWqRYMFYxCzAJBgNVBAYTAklFMRAwDgYDVQQKEwdBbiBQb3N0MRgwFgYDVQQLEw9Qb3N0LlRydXN0IEx0ZC4xGzAZBgNVBAMTElBvc3QuVHJ1c3QgUm9vdCBDQYIEOaaXHzBwBgNVHR8EaTBnMGWgY6BhpF8wXTELMAkGA1UEBhMCSUUxEDAOBgNVBAoMB0FuIFBvc3QxGDAWBgNVBAsMD1Bvc3QuVHJ1c3QgTHRkLjEiMCAGA1UEAwwZUG9zdC5UcnVzdCBPcGVyYXRpb25hbCBDQTAdBgNVHQ4EFgQUMjerH60XfHjiGICDZKxyJj/NsmYwDQYJKoZIhvcNAQELBQADggEBAK0PGS1oiSA3p+HuVCBO+H/qQjHvVmwIY3fz7njma/GU6WztcdzA8DAF9f/lI467rhiptozW6NU74KWf3UOarnki39sMBgAO4AhYYpdQgSqa5y+2zqKtSQKtxPYwck+NTptqH5iHTv1C78f9wNd83+6cBntwLu8aDYF+siR8h4DKltutXik6Sv5rfSr0SfclBWqmmMCMlunpYBido50mudWLwgRk+F3ZzqottRBgm4DcxznghV4+cRR1cNwo0XiqaBvSqZKJ7eNI4PQapeHI7PmXRqTxFIFGVzGYVYmXNqzS1hclag7rbZ+2nR+hRcafVAQs7JfJK6+ofEz7GrpkMyw=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://www.dcenr.gov.ie/NR/rdonlyres/A2D966E8-48E1-4709-BFAA-83FA07F3C7F7/0/HumanReadable_signed_tresignedxml.pdf</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>IE</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/pdf</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Department of Communications, Energy and Natural Resources</Name> -+ <Name xml:lang="ga">An Roinn Cumarsáide, Fuinnimh agus Acmhainní Nádúrtha</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/IE</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIICwTCCAiqgAwIBAgIJAJXDVBeDkXK3MA0GCSqGSIb3DQEBBQUAMHQxCzAJBgNVBAYTAklFMQ8wDQYDVQQHEwZEdWJsaW4xHjAcBgNVBAoTFURlcGFydG1lbnQgb2YgRmluYW5jZTENMAsGA1UECxMEQ01PRDElMCMGA1UEAxMcRXZlbnQgUHVibGlzaGluZyBJbnRlcm5hbCBDQTAeFw0xMDA3MDUxNDI3MjVaFw0yMDA3MDIxNDI3MjVaMFQxCzAJBgNVBAYTAklFMR4wHAYDVQQKExVEZXBhcnRtZW50IG9mIEZpbmFuY2UxDTALBgNVBAsTBENNT0QxFjAUBgNVBAMTDVRhZGdoIE8nTGVhcnkwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAL2eMyRkdde3Brd1N6gh1inG5j8gRbYQ6T/2BwiUlStHEeP/DmKcWKghQKEs6SBMSY/HGZw3ffrqe8tbzDBDeM0Z/F4xgSgYpcVL2QKTtQx4Wv61TESxNH7w5Jc9K2ZpeZz2bAcT2jrFdvBNcwtZ8hNyRsny2xNI8YuvpaZiLw1LAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBTxbALrhi0E0ebV6LpbNTNCvGXorzAfBgNVHSMEGDAWgBRfcPgfLU4sDzxy8r51M+iEDQIcjTANBgkqhkiG9w0BAQUFAAOBgQB4UDYDlveQZFbeN/za2UxQs+RqVZ9u+vT+lG4c+ecxmuFb6vpREjM28WciOAzzJ6hXcXxSZHgYbtVcL6F0JcPBT1HCFGTuHOWlBXzKL4zsuUmMYMPKD+2OojFDmAAvqlsqJT7bWA22EpxRHSf29twbbUuOw04rDAWh6RPDhg7zRg==</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIC5DCCAk2gAwIBAgIJAJXDVBeDkXNiMA0GCSqGSIb3DQEBBQUAMHQxCzAJBgNVBAYTAklFMQ8wDQYDVQQHEwZEdWJsaW4xHjAcBgNVBAoTFURlcGFydG1lbnQgb2YgRmluYW5jZTENMAsGA1UECxMEQ01PRDElMCMGA1UEAxMcRXZlbnQgUHVibGlzaGluZyBJbnRlcm5hbCBDQTAeFw0xNDA2MTYwOTU2MTJaFw0yNDA2MTMwOTU2MTJaMHcxCzAJBgNVBAYTAklFMTQwMgYDVQQKEytEZXBhcnRtZW50IG9mIFB1YmxpYyBFeHBlbmRpdHVyZSBhbmQgUmVmb3JtMRowGAYDVQQLExFHb3Zlcm5tZW50IFJlZm9ybTEWMBQGA1UEAxMNVGFkZ2ggTyBMZWFyeTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0+AtJZLHW+Nkc/Rho8qflL2lEr8OoChQ3nzhiGHSIW/QmpHzzm54mPL6dybLmnpE5/I2lum0c0DohkQKH07Ouz46Lk/AGs7qpRNE14y1WOtbL7JkW5Y7Ktv/gqv8neg77feAUiZNJaQZ2nhIaQi3OyXqwqzEGafzpWsj2BxId2cCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFMVbM3lCFwp+r61i88s1hisafmA+MB8GA1UdIwQYMBaAFF9w+B8tTiwPPHLyvnUz6IQNAhyNMA0GCSqGSIb3DQEBBQUAA4GBAAxyDOqFkdqel1AxOGm04dl87WdBvoew1wxaEp4AhUtk4nAmu7EgmB3scop6Q43hq+dWScvSxWPZAyKUGEmc/qsUnq9NRQGqpB8g9CJKYEC9HHkbNn7b/LbNRdvd49YEfC5qAPgj0SDmQffcahrIGyU2lzZfTW4I00cXn7ogUqu5</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://files.dcenr.gov.ie/rh/Irelandtslsigned.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>IE</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Department of Communications, Energy and Natural Resources</Name> -+ <Name xml:lang="ga">An Roinn Cumarsáide, Fuinnimh agus Acmhainní Nádúrtha</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/IE</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://www.neytendastofa.is/library/Files/TSl/tsl.pdf</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>IS</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/pdf</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">The Consumer Agency</Name> -+ <Name xml:lang="is">Neytendastofa</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/IS</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://www.neytendastofa.is/library/Files/TSl/tsl.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>IS</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">The Consumer Agency</Name> -+ <Name xml:lang="is">Neytendastofa</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/IS</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIExjCCA66gAwIBAgIQNdl1lNG2dU22NkLLterPzzANBgkqhkiG9w0BAQsFADA7MQswCQYDVQQGEwJJVDEQMA4GA1UEChMHRGlnaXRQQTEaMBgGA1UEAxMRVWZmaWNpbyBTaWN1cmV6emEwHhcNMTAwNTIwMDgzOTQ2WhcNMjAwNTE3MDgzOTQ2WjBbMQswCQYDVQQGEwJJVDEQMA4GA1UEChMHRGlnaXRQQTEQMA4GA1UEKhMHVWZmaWNpbzESMBAGA1UEBBMJU2ljdXJlenphMRQwEgYDVQQFEws5NzEwMzQyMDU4MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAI6sLMeL0AXS/zG30Nvh+mmtimUFvIVLeFZLaqg47bi5d7E1/IpkQnAwTyTT4yJGfrYrIrPnAK13wLcB4Za0WhYlBueW69uNHXhpkueIiGO9Wfeasx9T5tYcnrOUsoQTigTx3zcwY36DETwNqECu0uVH7K0al51s53SE5eVbQKMgJKa/uvP6hLxcvDdilsv9kyR4oNWOxlFeCSxl2aMVzs4zpSyNnmHwt2mQAgbzREnVvcjwOKAgRH9Kg6z5WiWsM2rNGRIeEkUIzHIxoc5WxkdNrBHppa79cmUCEIuBIE2ZtaNjOIVXvzYwkLq5TpgD5rSauUQZO3nduZxiPHVWmrMCAwEAAaOCAaQwggGgMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgZAMCgGA1UdCQQhMB8wHQYIKwYBBQUHCQExERgPMjAxMDA1MTMyMjAwMDBaMEEGA1UdHwQ6MDgwNqA0oDKGMGh0dHBzOi8vYXBwbGljYXppb25pLmNuaXBhLmdvdi5pdC9UU0wvSVRfVFNMLmNybDCBsAYDVR0gBIGoMIGlMIGiBgMrTBAwgZowJgYIKwYBBQUHAgEWGmh0dHA6Ly93d3cuZGlnaXRwYS5nb3YuaXQvMHAGCCsGAQUFBwICMGQwDhYHRGlnaXRQQTADAgEBGlJLZXlzIHVzZWQgdG8gZ2VuZXJhdGUgY2VydGlmaWNhdGVzIHRvIHN1YnNjcmliZSBuYXRpb25hbCBUcnVzdCBTZXJ2aWNlIHN0YXR1cyBMaXN0MB0GA1UdDgQWBBRIk1ErMuBTlDGOEariH5O7InkS7TAfBgNVHSMEGDAWgBS5A9dz6beQZDceQKN59MYviqnwqjAgBgNVHREEGTAXgRVJVF9UU0xAZGlnaXRwYS5nb3YuaXQwDQYJKoZIhvcNAQELBQADggEBACsvm2YLT0bB2Rgk5W1iG9mMYZCWE7rA+1h6Y9DmxS5zwdzFlwCr7EQ7DbWElQD0glq0hYO5COP6Z0YRhQsn2LypxLrzpWN/qhDBvA8Tol4/MPUqYznU1yBttt3aopqn0GR5iGlTCCYhDF3G8qj4sgOUsG6kJ/TGVbFiV9YRyUBUv7+3FN9ed95mtV2Cy0NVuG1JDSGot60qZfekHn1ZCg1KdaGnoYzk7Dzh2yio0/fEBPP9+r8sVCJCuujQYx+M5qQB/NHyAGXMUS//F3/4qhZAElz5/D/kN6Q3eYTtw04XIShGt89pbGsP7lXmvSLHSKPz98xBFQLqEwJn1QcWDLE=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEdzCCA1+gAwIBAgIQBSTQoxxf8UaYEMZNtexORDANBgkqhkiG9w0BAQsFADA7MQswCQYDVQQGEwJJVDEQMA4GA1UEChMHRGlnaXRQQTEaMBgGA1UEAxMRVWZmaWNpbyBTaWN1cmV6emEwHhcNMTQwMjEwMTE0MjM5WhcNMjAxMjMxMTE0MjM5WjBbMQswCQYDVQQGEwJJVDEQMA4GA1UEChMHRGlnaXRQQTESMBAGA1UEBBMJU2ljdXJlenphMRAwDgYDVQQqEwdVZmZpY2lvMRQwEgYDVQQFEws5NzEwMzQyMDU4MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIPOYhltsTauooCfL6ggktmvRogcxVMRHPh7R9PifTJQBSR67L23u7bp4lY+Vd9w9h60z0rzp+vNvNgc12zXcgHcoue2VdFEJTlptElj3t3OICulC4QA4vFEUuFp2fKxEIr0KdzvLlHfcHYBhC4flx9k0hdpbfkjn+hwC/WOusj7JBMXgl3P1PSjKWpXNhVOnvrr+m6AbmERazIk7aBCSy6joz+QrRgCLiXRuqJxV3FirlQnmLB8np4Mebd+JwwwTgcT6hhx+f8s31cv7HFQDeIUd1i2aTCg04OrpuawZVmZjgGNHj+79YGouuQfCys7jW6t0Lety6LsonaSxHpAQgECAwEAAaOCAVUwggFRMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgZAMD8GA1UdHwQ4MDYwNKAyoDCGLmh0dHBzOi8vYXBwbGljYXppb25pLmNuaXBhLmdvdi5pdC9UU0wvdGVzdC5jcmwwga4GA1UdIASBpjCBozCBoAYDK0wQMIGYMCYGCCsGAQUFBwIBFhpodHRwOi8vd3d3LmRpZ2l0cGEuZ292Lml0LzBuBggrBgEFBQcCAjBiMA4WB0RpZ2l0UEEwAwIBARpQQ0EgdXNlZCB0byBnZW5lcmF0ZSBjZXJ0aWZpY2F0ZXMgdG8gc3Vic2NyaWJlIG5hdGlvbmFsIFRydXN0IFNlcnZpY2Ugc3RhdHVzIExpc3QwHQYDVR0OBBYEFIZ211SuCQDJ//4sjSI7DacHi7EaMCAGA1UdEQQZMBeBFUlUX1RTTEBkaWdpdHBhLmdvdi5pdDANBgkqhkiG9w0BAQsFAAOCAQEBNSU/P4X7Dllqg4tXIrxsAjlQrSS0Znt6et8+zW21GI8QmYSq0R8qHjFQs+dfl5B/qmftebhVpVe6vSzyJndKWycMtdMX0gkC2o66Wpl6fMZ55voYCF8ZTqBDcqMMvCt8o9TzlIPdcaWUZmlj3QfH+nGiC2/3cY4ZK9IWtWrYlZYk7tQGA1RCvQFLz3Uy9kbK5XcpF5prPCwQ/f5VjZBfWut2TuqO3NUbQ0RUK5JPDHiInV7VwN9sMj5nbRfhOiMH5AENLU8/x9Mk7V9YsXXEXq/Qms8I/yk7HejSn0Rd/DurIUUP8UbBM3GCv5cAYoea1R3sG52tMZUxke88uOCLkg==</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>https://applicazioni.cnipa.gov.it/TSL/IT_TSL_HR.pdf</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>IT</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/pdf</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Agenzia per l'Italia Digitale</Name> -+ <Name xml:lang="it">Agenzia per l'Italia Digitale</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/IT</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIExjCCA66gAwIBAgIQNdl1lNG2dU22NkLLterPzzANBgkqhkiG9w0BAQsFADA7MQswCQYDVQQGEwJJVDEQMA4GA1UEChMHRGlnaXRQQTEaMBgGA1UEAxMRVWZmaWNpbyBTaWN1cmV6emEwHhcNMTAwNTIwMDgzOTQ2WhcNMjAwNTE3MDgzOTQ2WjBbMQswCQYDVQQGEwJJVDEQMA4GA1UEChMHRGlnaXRQQTEQMA4GA1UEKhMHVWZmaWNpbzESMBAGA1UEBBMJU2ljdXJlenphMRQwEgYDVQQFEws5NzEwMzQyMDU4MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAI6sLMeL0AXS/zG30Nvh+mmtimUFvIVLeFZLaqg47bi5d7E1/IpkQnAwTyTT4yJGfrYrIrPnAK13wLcB4Za0WhYlBueW69uNHXhpkueIiGO9Wfeasx9T5tYcnrOUsoQTigTx3zcwY36DETwNqECu0uVH7K0al51s53SE5eVbQKMgJKa/uvP6hLxcvDdilsv9kyR4oNWOxlFeCSxl2aMVzs4zpSyNnmHwt2mQAgbzREnVvcjwOKAgRH9Kg6z5WiWsM2rNGRIeEkUIzHIxoc5WxkdNrBHppa79cmUCEIuBIE2ZtaNjOIVXvzYwkLq5TpgD5rSauUQZO3nduZxiPHVWmrMCAwEAAaOCAaQwggGgMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgZAMCgGA1UdCQQhMB8wHQYIKwYBBQUHCQExERgPMjAxMDA1MTMyMjAwMDBaMEEGA1UdHwQ6MDgwNqA0oDKGMGh0dHBzOi8vYXBwbGljYXppb25pLmNuaXBhLmdvdi5pdC9UU0wvSVRfVFNMLmNybDCBsAYDVR0gBIGoMIGlMIGiBgMrTBAwgZowJgYIKwYBBQUHAgEWGmh0dHA6Ly93d3cuZGlnaXRwYS5nb3YuaXQvMHAGCCsGAQUFBwICMGQwDhYHRGlnaXRQQTADAgEBGlJLZXlzIHVzZWQgdG8gZ2VuZXJhdGUgY2VydGlmaWNhdGVzIHRvIHN1YnNjcmliZSBuYXRpb25hbCBUcnVzdCBTZXJ2aWNlIHN0YXR1cyBMaXN0MB0GA1UdDgQWBBRIk1ErMuBTlDGOEariH5O7InkS7TAfBgNVHSMEGDAWgBS5A9dz6beQZDceQKN59MYviqnwqjAgBgNVHREEGTAXgRVJVF9UU0xAZGlnaXRwYS5nb3YuaXQwDQYJKoZIhvcNAQELBQADggEBACsvm2YLT0bB2Rgk5W1iG9mMYZCWE7rA+1h6Y9DmxS5zwdzFlwCr7EQ7DbWElQD0glq0hYO5COP6Z0YRhQsn2LypxLrzpWN/qhDBvA8Tol4/MPUqYznU1yBttt3aopqn0GR5iGlTCCYhDF3G8qj4sgOUsG6kJ/TGVbFiV9YRyUBUv7+3FN9ed95mtV2Cy0NVuG1JDSGot60qZfekHn1ZCg1KdaGnoYzk7Dzh2yio0/fEBPP9+r8sVCJCuujQYx+M5qQB/NHyAGXMUS//F3/4qhZAElz5/D/kN6Q3eYTtw04XIShGt89pbGsP7lXmvSLHSKPz98xBFQLqEwJn1QcWDLE=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEdzCCA1+gAwIBAgIQBSTQoxxf8UaYEMZNtexORDANBgkqhkiG9w0BAQsFADA7MQswCQYDVQQGEwJJVDEQMA4GA1UEChMHRGlnaXRQQTEaMBgGA1UEAxMRVWZmaWNpbyBTaWN1cmV6emEwHhcNMTQwMjEwMTE0MjM5WhcNMjAxMjMxMTE0MjM5WjBbMQswCQYDVQQGEwJJVDEQMA4GA1UEChMHRGlnaXRQQTESMBAGA1UEBBMJU2ljdXJlenphMRAwDgYDVQQqEwdVZmZpY2lvMRQwEgYDVQQFEws5NzEwMzQyMDU4MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIPOYhltsTauooCfL6ggktmvRogcxVMRHPh7R9PifTJQBSR67L23u7bp4lY+Vd9w9h60z0rzp+vNvNgc12zXcgHcoue2VdFEJTlptElj3t3OICulC4QA4vFEUuFp2fKxEIr0KdzvLlHfcHYBhC4flx9k0hdpbfkjn+hwC/WOusj7JBMXgl3P1PSjKWpXNhVOnvrr+m6AbmERazIk7aBCSy6joz+QrRgCLiXRuqJxV3FirlQnmLB8np4Mebd+JwwwTgcT6hhx+f8s31cv7HFQDeIUd1i2aTCg04OrpuawZVmZjgGNHj+79YGouuQfCys7jW6t0Lety6LsonaSxHpAQgECAwEAAaOCAVUwggFRMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgZAMD8GA1UdHwQ4MDYwNKAyoDCGLmh0dHBzOi8vYXBwbGljYXppb25pLmNuaXBhLmdvdi5pdC9UU0wvdGVzdC5jcmwwga4GA1UdIASBpjCBozCBoAYDK0wQMIGYMCYGCCsGAQUFBwIBFhpodHRwOi8vd3d3LmRpZ2l0cGEuZ292Lml0LzBuBggrBgEFBQcCAjBiMA4WB0RpZ2l0UEEwAwIBARpQQ0EgdXNlZCB0byBnZW5lcmF0ZSBjZXJ0aWZpY2F0ZXMgdG8gc3Vic2NyaWJlIG5hdGlvbmFsIFRydXN0IFNlcnZpY2Ugc3RhdHVzIExpc3QwHQYDVR0OBBYEFIZ211SuCQDJ//4sjSI7DacHi7EaMCAGA1UdEQQZMBeBFUlUX1RTTEBkaWdpdHBhLmdvdi5pdDANBgkqhkiG9w0BAQsFAAOCAQEBNSU/P4X7Dllqg4tXIrxsAjlQrSS0Znt6et8+zW21GI8QmYSq0R8qHjFQs+dfl5B/qmftebhVpVe6vSzyJndKWycMtdMX0gkC2o66Wpl6fMZ55voYCF8ZTqBDcqMMvCt8o9TzlIPdcaWUZmlj3QfH+nGiC2/3cY4ZK9IWtWrYlZYk7tQGA1RCvQFLz3Uy9kbK5XcpF5prPCwQ/f5VjZBfWut2TuqO3NUbQ0RUK5JPDHiInV7VwN9sMj5nbRfhOiMH5AENLU8/x9Mk7V9YsXXEXq/Qms8I/yk7HejSn0Rd/DurIUUP8UbBM3GCv5cAYoea1R3sG52tMZUxke88uOCLkg==</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>https://applicazioni.cnipa.gov.it/TSL/IT_TSL_signed.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>IT</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Agenzia per l'Italia Digitale</Name> -+ <Name xml:lang="it">Agenzia per l'Italia Digitale</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/IT</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEIDCCAwigAwIBAgIJAOi9vb6/aYZ/MA0GCSqGSIb3DQEBCwUAMEoxCzAJBgNVBAYTAkxJMR8wHQYDVQQKDBZBbXQgZsO8ciBLb21tdW5pa2F0aW9uMRowGAYDVQQDExFUcnVzdGVkIExpc3QgQ0EgMTAeFw0xNDAyMTAwOTUyMzBaFw0xNzAyMTAwOTUyMzBaMEcxCzAJBgNVBAYTAkxJMR8wHQYDVQQKDBZBbXQgZsO8ciBLb21tdW5pa2F0aW9uMRcwFQYDVQQDEw5UcnVzdGVkIExpc3QgMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALRpptzN5mxrcRZ2MbyvTgF4huOe30lbI6sWrCq0gKTy6hk+Ussk7TYnE2tyN7IMFIEfQocdxNfMG2L30/jKGFRJ/NNrl2WWwV664I3P0qoIwJQ2RY8u7myyy8uF1WKjDRDbYqyf7jQSS1Onrmz9fPWltpDqyrgIvspb0owH+G2n70v3KUx1Itbr7Hc/4nbBIDTqr30xCCQsaUdti1beWgO9D7Ito3t0kozNbghClLBzr8fduSgaC2ucChIQA68UqXvqrzi81XCPBYymnOwGn2WaAwhtlBiHCg28NtPOYSFFrjZO7TBqFD5Ww+R1HkOcqRQbduMpLL1oKDq7bWyUZXcCAwEAAaOCAQowggEGMB8GA1UdIwQYMBaAFP1jbZk6PKL8QB/DFq6sVyuQJFSqMB0GA1UdDgQWBBTth+rnNQPRdw83reDey1xqpqcjWTAOBgNVHQ8BAf8EBAMCB4AwFwYDVR0gBBAwDjAMBgpggzYKCgAAAQEAMAkGA1UdEwQCMAAwEQYDVR0lBAowCAYGBACRNwMAMDgGA1UdHwQxMC8wLaAroCmGJ2h0dHBzOi8vd3d3Lmxsdi5saS9jcmwtbGx2LWFrLXRsY2ExLmNybDBDBggrBgEFBQcBAQQ3MDUwMwYIKwYBBQUHMAKGJ2h0dHBzOi8vd3d3Lmxsdi5saS9jZXItbGx2LWFrLXRsY2ExLmNlcjANBgkqhkiG9w0BAQsFAAOCAQEAXSlH+SmUacYJ8YoE+GBU3a3dfanh2jp4CIOId0MpPm1BGv9TkbNSFrT8n77vi5eIggr6NivPLM+hN+TAPymjE0+VIPme6AwL3zZadHx/oNmi7NRaCDuMfZ1jyAF/2dTtoY2kPi+XNlP/7m8bystWNV+zFBCr4NZcK+kwrkIB5y5iGoEos9e3zwHWSr7C2uyaYLlCLIBGhWLX6Ajgc2c8smLLc+GwzHwNgb+/HAN/yXRpO1Q7xLmkIPcsIdO0BvPRztwsjXD5799TILnnw2JPot37PXmgvzzx+HCKgzq2gr7rVcBLKDq2gJIT7OJQ5/b3z+Nst3LtngC904FRj9woeg==</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEIDCCAwigAwIBAgIJAOi9vb6/aYaAMA0GCSqGSIb3DQEBCwUAMEoxCzAJBgNVBAYTAkxJMR8wHQYDVQQKDBZBbXQgZsO8ciBLb21tdW5pa2F0aW9uMRowGAYDVQQDExFUcnVzdGVkIExpc3QgQ0EgMTAeFw0xNDAyMTAwOTUzMTNaFw0xODAyMTAwOTUzMTNaMEcxCzAJBgNVBAYTAkxJMR8wHQYDVQQKDBZBbXQgZsO8ciBLb21tdW5pa2F0aW9uMRcwFQYDVQQDEw5UcnVzdGVkIExpc3QgMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANnBAphC80GVlYVCFS9M/MlodzN4TIrp+dh22HkIFlvOZYoBPVOqy3MCCC5CF4hRuE8VLud4qdU8WY2a4HstI3OFPwpFHdijADH5M0LT5bEieP0JbGhjGc7ONB7x0haDiFRxdSpAc6IObc/63IjuFwKF+/wBAfer0v8YuSsmanoJhOQ9C7DdUECp0CmouIoM0omY8MBt28AYeVSA1MdIxGc6w1M5dmc2Op2eMHmVoypEWJKLL3HZZlESSBTKKv/nhA9XflYpPSCTZ40pfS1xuXhHha3222XzZM36Lt+WgizCZy24Hp+NlqdFbHmvH0oTcgn3xYKFhPh2Ji5Zs+5L53MCAwEAAaOCAQowggEGMB8GA1UdIwQYMBaAFP1jbZk6PKL8QB/DFq6sVyuQJFSqMB0GA1UdDgQWBBQf4Ft9JUhBqcpokFM69a0H5Pjl2DAOBgNVHQ8BAf8EBAMCB4AwFwYDVR0gBBAwDjAMBgpggzYKCgAAAQEAMAkGA1UdEwQCMAAwEQYDVR0lBAowCAYGBACRNwMAMDgGA1UdHwQxMC8wLaAroCmGJ2h0dHBzOi8vd3d3Lmxsdi5saS9jcmwtbGx2LWFrLXRsY2ExLmNybDBDBggrBgEFBQcBAQQ3MDUwMwYIKwYBBQUHMAKGJ2h0dHBzOi8vd3d3Lmxsdi5saS9jZXItbGx2LWFrLXRsY2ExLmNlcjANBgkqhkiG9w0BAQsFAAOCAQEAFLeKftx23euwqrtAHlVW2uGK9ckzCcIsQVAKLgWj2+2Kux71G1+qiOc4CRcNUKWtKa4AGUKDmAcOJye/v3y8I3mX00UlLXPQqnNXNHK6K0YlYHQ5iyoHlkT/ep/nyMjRhMEg4q3oz6wqagGk2b2IDvqcMx6Nm4QLIV6Ckfl8/a+6XDLw6EypugkbcrITLFS/Xv6asEq73FMX5MjZIx5+r5GOWkauhebFRnP8usuUKVHCh7KJQD0OgABI1TbL9wR/DbIMIEf5hQA9Uo1DB4w11xsgyf+QQuqYl3A+etSPPTVZGDqQAAlhQ+KXsLTDFrkkzJWmO6GC2k1NHg1bzgm5IA==</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://www.llv.li/files/ak/xml-llv-ak-tsl.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>LI</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Office for Communications</Name> -+ <Name xml:lang="de">Amt für Kommunikation</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/LI</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDwzCCAqugAwIBAgIFEuK7zLkwDQYJKoZIhvcNAQELBQAwcTELMAkGA1UEBhMCTFQxSTBHBgNVBAoMQENvbW11bmljYXRpb25zIFJlZ3VsYXRvcnkgQXV0aG9yaXR5IG9mIHRoZSBSZXB1YmxpYyBvZiBMaXRodWFuaWExFzAVBgNVBAMMDk5lcmlqdXMgQmxhenlzMB4XDTE0MDEwMTAwMDAwMFoXDTE3MDEwMTAwMDAwMFowcTELMAkGA1UEBhMCTFQxSTBHBgNVBAoMQENvbW11bmljYXRpb25zIFJlZ3VsYXRvcnkgQXV0aG9yaXR5IG9mIHRoZSBSZXB1YmxpYyBvZiBMaXRodWFuaWExFzAVBgNVBAMMDk5lcmlqdXMgQmxhenlzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwKBYP2yM8004HUNQGbKU/6HJqXV5SaI1p/d56imQaweezz80T4yUwU5Ghfp+1X+2AC6H3HZrPxhuHEqEvUtlgzpPJDbMI7keJsQvwbv0kUG/tbSS1diP7VaRx1/unO92kkwdJgKv9EaCO4yU5Z+eVfLoQx72ZWp/nab0TllywmNVWhZj4nOl+Rm8p6hvWu/Kwt2ky0lTkSrHTvmpQkM+ZiMS3NS6IPHCovHtjLqs04u97BfOemAzy8ZcsGmcF4dIF4Zn3rgdZsV0dq1AVrfa8tRrCU6eD31TAGS6DQAwD/qn4PMdEiqYNGeY2CAQ9YjpboV5g/U4GHRwc+UjLaF3YQIDAQABo2IwYDAdBgNVHQ4EFgQU1PbRhXoxr0fYWtavjCnXbQKb+5QwCQYDVR0TBAIwADAOBgNVHQ8BAf8EBAMCBsAwEQYDVR0gBAowCDAGBgRVHSAAMBEGA1UdJQQKMAgGBgQAkTcDADANBgkqhkiG9w0BAQsFAAOCAQEAe5vJOlbUuz75xFt8JnkjjAJWct9cczvhFwZGNLsdvkiUdV6qiIefPyw6e2Hsc+mON9yYM+Km5X0ugsdy7V8vI2ycp/794mHscfPyoX3rgbPY7zPBMYJxtqfDHPcBRRGfuXxMHFou13jiM6fSYNchhlcpHkxYt5xyMOgnernV6FsGhPNgJomXnsJBQn1ClHYTXTudgHRzgAw9I+IKbONgnVZqDjqyaEar/DfduPFPh0hWXfCnIaTcDSbdWjy3llqWpxMofsTwXFpoYgDO3iG+IIZl3eipAMe2PJPqbIn5Y9FKEtssmmG1KcLPJpAT76NPWIK4nj/mYtZUhnLFsEhwQg==</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDxzCCAq+gAwIBAgIFFD1WPq8wDQYJKoZIhvcNAQELBQAwczELMAkGA1UEBhMCTFQxSTBHBgNVBAoMQENvbW11bmljYXRpb25zIFJlZ3VsYXRvcnkgQXV0aG9yaXR5IG9mIHRoZSBSZXB1YmxpYyBvZiBMaXRodWFuaWExGTAXBgNVBAMMEFZhaWRvdGFzIFJhbW9uYXMwHhcNMTYwMTAxMDAwMDAwWhcNMTkwMTAxMDAwMDAwWjBzMQswCQYDVQQGEwJMVDFJMEcGA1UECgxAQ29tbXVuaWNhdGlvbnMgUmVndWxhdG9yeSBBdXRob3JpdHkgb2YgdGhlIFJlcHVibGljIG9mIExpdGh1YW5pYTEZMBcGA1UEAwwQVmFpZG90YXMgUmFtb25hczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKaAn16pu+wmSKcOF+XAwinNPt+cOEcVTp0kfJvMbu1+g5a6Sbjp60iofbxtjj8CI6uJQ0BPhwxV3WuTSNO3V4+MaMK4D7hsYV4hbx5AFUc8l88qLxAFMtoBmrfHM8LEDGP62pbgLAkk7Wye2Jb2V9FHzIooCBpws+l7TxtWg4m7pmmRyU0wXiwztkLbYypyX98cQZyT0vJAaYGZIFt7PWaQtgdmJQsPXsyLU5k740EupGzgGOnsc187ll0cByHRuUQeZi5zBMJtCEECt/eClYVajV6yr0frYw59676Afe5W/ecF0uLPiJl05PLjjFF19BjCHAt7z7hKn7k+CHeTJT0CAwEAAaNiMGAwHQYDVR0OBBYEFFnVjew3yC3Q+lU+Z3pwRZk7QkglMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgbAMBEGA1UdIAQKMAgwBgYEVR0gADARBgNVHSUECjAIBgYEAJE3AwAwDQYJKoZIhvcNAQELBQADggEBAIns4XuCL9eqwZUkjZfcfsDJNfotALSvdYN0VALyBZtDSIFi7uLQITM7GVczL7PYY+/VvQ3jAVQcXeF1tofsqcuk5/Ae/qb7gM/+qKjUA3fdoqxZ/dCmaloL8WEF0y1taS8Ii44XnQb9Hy3STLKqdsfawJ7bZ3MLXvBWPyAil1mfVWivttuYh0lJ0ejMd/JrYxM5ewJSzMRF9q42U+lramRik3BiuW0JvHosKbWjbvgggx4MB7f658Ul4cvB9hwewFupYlKmXUnWFLUS4/Y249N6DzxY1nYtL5cf1laA34i9SpImjlwMJSV8cBqPnbH/54hvnbUT9B8nGYMyLKs1XVg=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://www.rrt.lt/failai/LT-TSL.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>LT</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Communications Regulatory Authority of the Republic of Lithuania</Name> -+ <Name xml:lang="lt">Lietuvos Respublikos ryšių reguliavimo tarnyba</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/LT</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://www.portail-qualite.public.lu/fr/publications/confiance-numerique/liste-confiance-nationale/tsl-pdf/TSL-PDF.pdf</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>LU</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/pdf</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">ILNAS</Name> -+ <Name xml:lang="fr">ILNAS</Name> -+ <Name xml:lang="de">ILNAS</Name> -+ <Name xml:lang="fr">Institut Luxembourgeois de la Normalisation, de l'Accréditation, de la Sécurité et qualité des produits et services</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/LU</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://www.portail-qualite.public.lu/fr/publications/confiance-numerique/liste-confiance-nationale/tsl-xml/TSL-XML.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>LU</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">ILNAS</Name> -+ <Name xml:lang="fr">ILNAS</Name> -+ <Name xml:lang="fr">Institut Luxembourgeois de la Normalisation, de l'Accréditation, de la Sécurité et qualité des produits et services</Name> -+ <Name xml:lang="de">ILNAS</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/LU</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://www.dvi.gov.lv/en/wp-content/uploads/TSL/tsl-lv.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>LV</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Data State Inspectorate</Name> -+ <Name xml:lang="lv">Datu valsts inspekcija</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/LV</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDtTCCAp2gAwIBAgIJAPXsVjGOrIQXMA0GCSqGSIb3DQEBCwUAMEkxCzAJBgNVBAYTAk1UMREwDwYDVQQHEwhGbG9yaWFuYTEnMCUGA1UEChMeTWFsdGEgQ29tbXVuaWNhdGlvbnMgQXV0aG9yaXR5MB4XDTE0MDUyMDA5NTE1NloXDTE4MDUxOTA5NTE1NlowSTELMAkGA1UEBhMCTVQxETAPBgNVBAcTCEZsb3JpYW5hMScwJQYDVQQKEx5NYWx0YSBDb21tdW5pY2F0aW9ucyBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDKPl3MKhU9x9uDAU01z90WiEL1r9L7v5BQ3vd3F9FQ3fXaxgKlGxEbaMoGYlFgIfuq5ryG+JDq2r4Rk7PW0POoFKHWZofzVSU0GLKn5z3aqnuuL5CN2yQb8j4hKECeWiVzVd5R67UrS/yjIlRvFSjbGU+q2x4AGUP+M24seGmPjbFjTQmPdxal9crrrI0dUJ62fAI6XDqsfJf/OJ2GZziJoBEDwmlDJfGlE0FhKXqwGN9wnfE35BcCyyJ9f1zdOtOE7LheLzslMXC0i6qyZ1FNHpXKyCjVPIrEjdagZcY3K+V+TUh/SFTgRck3TqN2F+kCrN+xVEcOf9oQgb8vAv7nAgMBAAGjgZ8wgZwwYwYDVR0jBFwwWqFNpEswSTELMAkGA1UEBhMCTVQxETAPBgNVBAcTCEZsb3JpYW5hMScwJQYDVQQKEx5NYWx0YSBDb21tdW5pY2F0aW9ucyBBdXRob3JpdHmCCQD17FYxjqyEFzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIGwDAdBgNVHQ4EFgQU/dPIsI60+QT7YKYnhx45VDdb9YkwDQYJKoZIhvcNAQELBQADggEBAGWWjEBsICFiNXowAHFd2kzhWKBPvcPOYJ3hW0BjQvCxcRK+zM1jUU6SMTOv8k56mm3gfakEmlCWGYj1tyXmGwYtthBkJtkthOygX00RrwAVXXZY6yf1H2SB1vvM0+NL41apSBPDI6tQhD2uw7wHLZBnaIoC4iqUAQBdH3+DQ4KZ9fYg7ULu3W1s5SKa96yj6zKyO+NQnZd9e/WCJrlAtrf0f8BHmMSkbJB3u6bvEc4tWnj1h5oV+esIFi0nbfZMpREExCF2V4eq1gBOe6zz/pfXhO8evjb4Kn7Loyw8Sr2GXMIbypbn67e50BqQdtUVeukD+l50/UCA/7xI2VXSp+Y=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDtTCCAp2gAwIBAgIJANGZrDHpPeweMA0GCSqGSIb3DQEBCwUAMEkxCzAJBgNVBAYTAk1UMREwDwYDVQQHEwhGbG9yaWFuYTEnMCUGA1UEChMeTWFsdGEgQ29tbXVuaWNhdGlvbnMgQXV0aG9yaXR5MB4XDTE0MDUyMDA5NTcyNVoXDTIwMDUwODA5NTcyNVowSTELMAkGA1UEBhMCTVQxETAPBgNVBAcTCEZsb3JpYW5hMScwJQYDVQQKEx5NYWx0YSBDb21tdW5pY2F0aW9ucyBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzlByjEn5W2DyrJG4r6SA6HiC0+7xzJH4Fl/EqIomyoeSBkci32aW17Bhx1MyYq+uLb6IURMUoqSIs1ZNh4lj4yycgCq/UHh0GttERM643wAOQtrxb3/Ds3txIkJSJ+DCRVMOyDJO2uWqcXFa1V6e62xH2ZWSp/TbrmlRGzWlpVyu80xE/pIn6Gs7pEAyz8TUOiPsPOw5h3kJttrRURmq3WafcRW4eDiVUIehL1rGv8635qyB+JKG7pWw8OsfVylIAcj75UUTOqM4I6oHKyOJPLXM3DcPjzwfDwWlbXABgtNEDJYIfpQd9vdjEgXsXkmsSNzgd5vPh7MbOE58ShsgfAgMBAAGjgZ8wgZwwYwYDVR0jBFwwWqFNpEswSTELMAkGA1UEBhMCTVQxETAPBgNVBAcTCEZsb3JpYW5hMScwJQYDVQQKEx5NYWx0YSBDb21tdW5pY2F0aW9ucyBBdXRob3JpdHmCCQDRmawx6T3sHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIGwDAdBgNVHQ4EFgQUTU4Fh/R+vnm6W3aZdKQNAtGpfT8wDQYJKoZIhvcNAQELBQADggEBAAgU3PUUWGxToG5cDdZAVBimax+O6LbdSrxi2V2Sy4RmKcMZzT/9G9Gw+nHgFrb/4nkZD550RWArzhBpv4+2+G3WFroZ6ThYxsPpLdayU7Rj7JtRoCkE7qOPzerTE7k4jMIb7ejdrNvMRZz3BjEu5PE80hpUByXGHVTqBq8lw/CehgdfYD/CtLZ2hJK9o1KPqi8DPKMAvFQyYcSZ5G5GqMnhbwyZKo1YB/cEl73KsZ3OF4asKSSh5vQwbRpxd/AQTVLr9Y6VyQ+xl4NXBUhIgKoNyLm3B43tel3l4E314L5ihFJK6Kz/P6IfTeU8orCpTFfC4ylogdhMwlLgXlaoNwM=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://www.mca.org.mt/tsl/MT_TSL.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>MT</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Malta Communications Authority</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/MT</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIF/jCCA+agAwIBAgIFEuuke34wDQYJKoZIhvcNAQELBQAwdDELMAkGA1UEBhMCTkwxKjAoBgNVBAoMIUF1dGhvcml0eSBmb3IgQ29uc3VtZXJzICYgTWFya2V0czEWMBQGA1UEAwwNTkwgVFNMIFNJR05FUjEVMBMGA1UEFBMMKzMxNzA3MjIyMDAwMQowCAYDVQQFEwEyMB4XDTEzMDQwMTAwMDAwMFoXDTIwMDMyNTAwMDAwMFowdDELMAkGA1UEBhMCTkwxKjAoBgNVBAoMIUF1dGhvcml0eSBmb3IgQ29uc3VtZXJzICYgTWFya2V0czEWMBQGA1UEAwwNTkwgVFNMIFNJR05FUjEVMBMGA1UEFBMMKzMxNzA3MjIyMDAwMQowCAYDVQQFEwEyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAriEnqugEYAIKecxPDpGzACCuO+qGAdHHlrIjE2RxqIwGGY0poppNoxAETuKUiU7VmdRk366UFtGWvl6xb1lAL5d4SL8695oZcKX47u04uCusceEEyujfzrRAm62UWL/1+CChpPeZLqgnVc60152qjUwR2ogOCV13HZXegWrVUxXMwlag5mSF0Di1E93wVMHH3+4jAj/BRDtpmaFBRQ5X1xOZN73jVU6y8S8i96CHFem2jiDh/FPV+jvZALObhwNZ3bFWNZDt1thHufUMrLz1wYb65ilOXeSBYUXRDLGALZUvNPnKwkv1O4xU2tCpJ+29mPkRiBuzc8qZ40mo85UG0TQfqXbOEW4bRIkk57ewqHyLtXjCHXznXDt4mp19MYwIQ+0sDWnsw14G1U/XvlcFgAnz054X1f4B38WVYvuVemHr64s3T/cQsvhL/bAoBi3NDzq9xBl6e2TlHL5LLavp+Yw37+CYv2mZveVi3NcMer8Vgzy3M9PT00/ZG9cjtv7sheRbxMqZjpfLyEtULSw/ecK9APhOPrUn5CYFfBZeh6XRSkI5mZ8NUmJDQ4mN62EUP2ayetSpaugAkUUbNc/RYwZrxgH+2ey/6LOvOFmv6OOg34saFLdKdUddZpFcQe+ID8N0TKTG3nhN+JqV8QAzbsPCRF6DP2dIKC6TwgezxBUCAwEAAaOBljCBkzAdBgNVHQ4EFgQUtusU1UVT6Rll2H8hMx/m+2RWJfcwCQYDVR0TBAIwADAOBgNVHQ8BAf8EBAMCBsAwEQYDVR0gBAowCDAGBgRVHSAAMDEGA1UdEQQqMCiBCnR0cEBhY20ubmyGGmh0dHBzOi8vd3d3LmFjbS5ubC9lbi90c2wvMBEGA1UdJQQKMAgGBgQAkTcDADANBgkqhkiG9w0BAQsFAAOCAgEAXMD8Y/0+FNwWfhcBcN5aMp8eRQHURDQe5LvkjF5YRj+Ws4KIse1O/bjD+BTvRUbhmTOH3cxfvHzGiO6EML4+a2ovToZvPXEWw9v3qN5bl0ShYLUbZA9IHTljuZUTab2ILtwX98YDqiiBl7mR0X5SeqeULBBzv29EBctgxpkGNvxRRsT6HFUsjEy3y018euYGgL/uKXnLoNz4MXWOmPfk705br16kM9/cg0p14k5kg4UZCFzGwMEzqpHUK/Ps/KH/xkgN0IlVxu/h+rLugJEVqJ1cumEteqHsbuyxLOrqIPU8utDtm71zkc06nery3xXU8L5+bjtYRlGzgioK0nNwXhuXaJT/hA3cYlXHnw6R9CqWJ4loSueg5dM/JO1YpMhLQrCSAPteW7D9+2zXeQ8YXE69ZQZ5oiB0MiGnU03r6cH2sls9loX3e3vQZ3XNkct1m20AzZ2GZucPI56S765nRHZzHfTz4AalEG2zyk/5dUz1bUR5jwYc9ccErJj20ynIKFKqIQwrAG2ZXRvi4YZNosckVYn/8dsOPW1XNVTwj7B6qcMlovqFZmZkVSZbFJxRWeM8qMOgaYK6UeknIMwUZdiQg96W6LdgiW25XE8VOWfJppG0dDw6xbwTr1xPMwuZdGu1HPF04iBFMZmjZa+CY2W3Ub1fJMRWw9Pewk0csKQ=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIFzzCCA7egAwIBAgIFEpzEZsgwDQYJKoZIhvcNAQELBQAwXTELMAkGA1UEBhMCTkwxKjAoBgNVBAoMIUF1dGhvcml0eSBmb3IgQ29uc3VtZXJzICYgTWFya2V0czEWMBQGA1UEAwwNTkwgVFNMIFNJR05FUjEKMAgGA1UEBRMBMzAeFw0xNDAxMDkwMDAwMDBaFw0yMDAzMjUwMDAwMDBaMF0xCzAJBgNVBAYTAk5MMSowKAYDVQQKDCFBdXRob3JpdHkgZm9yIENvbnN1bWVycyAmIE1hcmtldHMxFjAUBgNVBAMMDU5MIFRTTCBTSUdORVIxCjAIBgNVBAUTATMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDqOstItu84JkhN6hgxcV1YiGYUuhM9DduuaSuqiYwI0LtdTCbzRo9hbvU5KrvcmgcNBUVnOECAKOmP7h4U2+BZhM4ldf6rT4bv/arwuwwOQR7Po5erjMUhaxA6zcYsO1jPYYfI0+MZOCIZir3c4u5NdfPHhfzvv/lwob5OZ8/mhCaCVxwLvxto309L8yjzuYHc3H22veUoNxEN6pwhJWMPNVe1ERSPpG/7lCfaGVl3igvgQAA5oAQ21Ze23fSUJ/Tj6Xgj8Mai1HkD7+Lsq6q+faSZ62fel4xY8jquzm2AxLXNZl8nopzPYvzoUj7vCS52L1G4l475rS1hmm+Wr0NxlupJ61BF2S6tr9CCzBoeBT1vdNI8nbYkIwQuUI//etCjptvjXcGu4fD4u5zrAGceu92hxz4xHbztUjpsLEaioFPoCnWsyqFGtkvYDCyXxJ0fKmkB3KUpAoGh8Dhsi6JWr0nnMYrZUcRBAF1cie5qKBRMmD+/2wBTO4fEVmTFMiRexAz6kW45zQROpQ1405M7zyc77MgcgXvPwwJ4HJgEKzHDjYpCxWI2qlOPtkoNs8WAtn8Mbqxj/cuU9KlmGlCK+WQGDUOS4ziuwP12iIlxg0CROJmJu3wmVl8KvlwZjexub18n4K8VpznIXQWjt2MEBYNUSXFTM9Ms4Bamb57QYwIDAQABo4GVMIGSMB0GA1UdDgQWBBTuca7VbkGi4o0pPmNhW4X1+l+3iTAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIGwDARBgNVHSAECjAIMAYGBFUdIAAwMAYDVR0RBCkwJ4EKdHRwQGFjbS5ubIYZaHR0cDovL3d3dy5hY20ubmwvZW4vdHNsLzARBgNVHSUECjAIBgYEAJE3AwAwDQYJKoZIhvcNAQELBQADggIBALT6Uj/x8zfdpMY+78PM6yuWUvvKjA/Tqf1TAEPsWQY38PHA48td9tW8uy9gxoSaGvaAAQmrGI7D9e5u669I0exo0zN+7/eMIZp5eWxTmvRUrGhxuErbTmpxhWB2B8pm8vIfUGsAzC2YLsILp2Rv5rXApQwF/4gPPs4iWMb081SJ4cDL0iMvvLYYYfJY7Ob/3MrmsO4Uasj8YKQtuarFkEKOTP6DBRaUCnBpFfttdhF8MGOZPIMwO1YalKyjMzEQDz/L4nB1ZYtqyevqgj5+SxokugzY3/Ais05wjM0y3K4/Bj0ddWZCPfAiBpCqHNCW0j3FrJc2HodO9eKa/dl+b5g0hNu3xoHyLMe+KCe9MQpwu/dUBFLkg69UxX3RvgTLEfYpa1A1QMRt987xFqk65IL0pH68DWTL3RY4e6NvXg81nXeDzhKMRRk+PmHHS75s7WYZlXSPE1lLRBsN0CVoQSaGPWB2oLo54C/fuw6uq7KbXWVdisiHH7sZckSjkRl5yTNOjp6FT6niYH2S5a/qoR8zclL+AFmX1fLJ/IS4dYFDIaR2KAW4t7Bk+sIjGVZ2/k3+TsTKOH+iHPOxaYOyUn6olG4Bg4GJwpPB74EmRw8P2xnsXX4qevHA1KuNj/6YkvU4/uOiWjjphKSEFZoDkcHdwXdr2EuhJX89od0H8tAz</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>https://www.acm.nl/download/bestand/current-tsl.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>NL</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Authority for Consumers & Markets</Name> -+ <Name xml:lang="nl">Autoriteit Consument en Markt</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/NL</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIE8zCCA9ugAwIBAgILB2ZLeEvsahPcLG8wDQYJKoZIhvcNAQELBQAwSzELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MR0wGwYDVQQDDBRCdXlwYXNzIENsYXNzIDMgQ0EgMzAeFw0xNTAxMTMwOTE3NTRaFw0xODAxMTMyMjU5MDBaMIGJMQswCQYDVQQGEwJOTzEpMCcGA1UECgwgTkFTSk9OQUwgS09NTVVOSUtBU0pPTlNNWU5ESUdIRVQxEDAOBgNVBAsMB05ldHQvTkUxKTAnBgNVBAMMIE5BU0pPTkFMIEtPTU1VTklLQVNKT05TTVlORElHSEVUMRIwEAYDVQQFEwk5NzQ0NDY4NzEwggEfMA0GCSqGSIb3DQEBAQUAA4IBDAAwggEHAoH/ANeweXbKKHrkQW35hOpV9H1GwIRIqwJQf+aBtoMd4SHKRXcBKGEiNpnqhS6kdur52VuDwzGvogv0ax+uWok12yMoLKwjN2UhYX5HtkzkcXys0k4BY3DpggZ5jrzWWvDNoOsgraom68OOBaXOVwswiexPDZ6aDxz0mDJBfNEodEzcR84zW+om31wvoe+RHEARvsM/6lWmIW6A9moze/350L/cXMCDynRn3RKAWi9XbIqo7Qrve9O+ezobdj7a6ynNYdS3/BWUrx13dC6RObnAsxW5YJN7lmrvHYTCno5PFPUb0P4yNXkuODoYUitIV0GHROrB1qivhGBsWNbKhY17AgMBAAGjggGaMIIBljAJBgNVHRMEAjAAMB8GA1UdIwQYMBaAFMzD+Ae3nG16TvWnKx0F+bNHHJHRMB0GA1UdDgQWBBRmTbuN0c7EqTSY57PDZomR8/hWKTAOBgNVHQ8BAf8EBAMCBkAwFQYDVR0gBA4wDDAKBghghEIBGgEDBTCBpQYDVR0fBIGdMIGaMC+gLaArhilodHRwOi8vY3JsLmJ1eXBhc3Mubm8vY3JsL0JQQ2xhc3MzQ0EzLmNybDBnoGWgY4ZhbGRhcDovL2xkYXAuYnV5cGFzcy5uby9kYz1CdXlwYXNzLGRjPU5PLENOPUJ1eXBhc3MlMjBDbGFzcyUyMDMlMjBDQSUyMDM/Y2VydGlmaWNhdGVSZXZvY2F0aW9uTGlzdDB6BggrBgEFBQcBAQRuMGwwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLmJ1eXBhc3Mubm8vb2NzcC9CUENsYXNzM0NBMzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC5idXlwYXNzLm5vL2NydC9CUENsYXNzM0NBMy5jZXIwDQYJKoZIhvcNAQELBQADggEBALS/sVxRLfnPGbwofV3Lhi8aIK0q6zJiexeNya18eOhhb/uIlFBY1OqsStfYHbG6HeB7kW8uEg2eekUOMZnq7hzVGhH6zl2gwfQijQ4Z2EGzwnMGAxo1ECzCom/U8A2Vedfna6dTJ/Be+wuwH9fAeIkLJ4XIGRTDiB6+5vVyNVx+ABkrUMxLvcFGDu7Tig0tCdhfkTNV604InVAcjVFNb1meyo/TjMmqx6TIYfjqCwi7EaThi3IKEB1Y+yxcU9TCweznyWobBfNOanq55vfemlTZm6+xooo3bAgsCp6AxF6ozVNpkSCRnGNjBICM2IqXiqNnsFwstfhB1zqwsmtaOGs=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIE8zCCA9ugAwIBAgILB60XOtlOKDyeNGYwDQYJKoZIhvcNAQELBQAwSzELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MR0wGwYDVQQDDBRCdXlwYXNzIENsYXNzIDMgQ0EgMzAeFw0xNTA1MTExMDIxMzVaFw0xODA1MTEyMTU5MDBaMIGJMQswCQYDVQQGEwJOTzEpMCcGA1UECgwgTkFTSk9OQUwgS09NTVVOSUtBU0pPTlNNWU5ESUdIRVQxEDAOBgNVBAsMB05ldHQvTkUxKTAnBgNVBAMMIE5BU0pPTkFMIEtPTU1VTklLQVNKT05TTVlORElHSEVUMRIwEAYDVQQFEwk5NzQ0NDY4NzEwggEfMA0GCSqGSIb3DQEBAQUAA4IBDAAwggEHAoH/AOLRUA+xKHVDzi9jvgJsoLnprCicC3znjuVw/r4Rh4NtMmJjfd+e1x17Um009EyPX8+gZpu3ra2Ie87uFQ2llKVByH9gflvapnb4wXevwkC6f6sdQHzDV2j3D67xQ8HulLSEcQN5FFH/AmN3r7S1WBUY8LuF5//ej0QJPEMiufojilJiQQPlixbCBFlCLmqlJ3kACZ87/xRI9TDYEsNDV0WJQJFP2Ex1V+yNP1RnaEiH2UCeXoY91nOpzltQFdAdRXsp8J4SRjP2Y7lIyGo6IWz5JVNjboXHrO/LfAx57x3eP70reYorBfZJufm3oYJ3uuBtFnD4eX0XiVey3e4LAgMBAAGjggGaMIIBljAJBgNVHRMEAjAAMB8GA1UdIwQYMBaAFMzD+Ae3nG16TvWnKx0F+bNHHJHRMB0GA1UdDgQWBBQQQqOR56u9hXZEtg3lIC/zsc0tCDAOBgNVHQ8BAf8EBAMCBkAwFQYDVR0gBA4wDDAKBghghEIBGgEDBTCBpQYDVR0fBIGdMIGaMC+gLaArhilodHRwOi8vY3JsLmJ1eXBhc3Mubm8vY3JsL0JQQ2xhc3MzQ0EzLmNybDBnoGWgY4ZhbGRhcDovL2xkYXAuYnV5cGFzcy5uby9kYz1CdXlwYXNzLGRjPU5PLENOPUJ1eXBhc3MlMjBDbGFzcyUyMDMlMjBDQSUyMDM/Y2VydGlmaWNhdGVSZXZvY2F0aW9uTGlzdDB6BggrBgEFBQcBAQRuMGwwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLmJ1eXBhc3Mubm8vb2NzcC9CUENsYXNzM0NBMzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC5idXlwYXNzLm5vL2NydC9CUENsYXNzM0NBMy5jZXIwDQYJKoZIhvcNAQELBQADggEBACheabFtAi3vC5m8cLjy1LEoigFQzzuVKiadkEpSS0tbIf61Jlr3avUxfUAMVA1yPMqWu+dxf0UvMBknMVHz92VKGZwqS1eR8KbsFj6HqAQb+xCQcVXrroQ+QGxM9/p6A1MS6nKIEO7SipUNbl1ww0YtFDyTa9FL/SHAZvGTEoRECVAl+uiu/HuvCoQFTzo2cYvwlDVbfb63SYwzukn992w8wbAh0MYeoGVO0stJ0oS+Utqk60g3jWjPy0cPLIV/x/wUxmgKRwaMuuUeN9EQcgj2Lnk7kPSmc+pT+mr+ZVHGvKEgS89HGDivgjYDeG8ocTV8n/nzKcVIUPXLVY4cBlg=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://www.nkom.no/TSL/NO_TSL.PDF</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>NO</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/pdf</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">NASJONAL KOMMUNIKASJONSMYNDIGHET</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/NO</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIE8zCCA9ugAwIBAgILB2ZLeEvsahPcLG8wDQYJKoZIhvcNAQELBQAwSzELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MR0wGwYDVQQDDBRCdXlwYXNzIENsYXNzIDMgQ0EgMzAeFw0xNTAxMTMwOTE3NTRaFw0xODAxMTMyMjU5MDBaMIGJMQswCQYDVQQGEwJOTzEpMCcGA1UECgwgTkFTSk9OQUwgS09NTVVOSUtBU0pPTlNNWU5ESUdIRVQxEDAOBgNVBAsMB05ldHQvTkUxKTAnBgNVBAMMIE5BU0pPTkFMIEtPTU1VTklLQVNKT05TTVlORElHSEVUMRIwEAYDVQQFEwk5NzQ0NDY4NzEwggEfMA0GCSqGSIb3DQEBAQUAA4IBDAAwggEHAoH/ANeweXbKKHrkQW35hOpV9H1GwIRIqwJQf+aBtoMd4SHKRXcBKGEiNpnqhS6kdur52VuDwzGvogv0ax+uWok12yMoLKwjN2UhYX5HtkzkcXys0k4BY3DpggZ5jrzWWvDNoOsgraom68OOBaXOVwswiexPDZ6aDxz0mDJBfNEodEzcR84zW+om31wvoe+RHEARvsM/6lWmIW6A9moze/350L/cXMCDynRn3RKAWi9XbIqo7Qrve9O+ezobdj7a6ynNYdS3/BWUrx13dC6RObnAsxW5YJN7lmrvHYTCno5PFPUb0P4yNXkuODoYUitIV0GHROrB1qivhGBsWNbKhY17AgMBAAGjggGaMIIBljAJBgNVHRMEAjAAMB8GA1UdIwQYMBaAFMzD+Ae3nG16TvWnKx0F+bNHHJHRMB0GA1UdDgQWBBRmTbuN0c7EqTSY57PDZomR8/hWKTAOBgNVHQ8BAf8EBAMCBkAwFQYDVR0gBA4wDDAKBghghEIBGgEDBTCBpQYDVR0fBIGdMIGaMC+gLaArhilodHRwOi8vY3JsLmJ1eXBhc3Mubm8vY3JsL0JQQ2xhc3MzQ0EzLmNybDBnoGWgY4ZhbGRhcDovL2xkYXAuYnV5cGFzcy5uby9kYz1CdXlwYXNzLGRjPU5PLENOPUJ1eXBhc3MlMjBDbGFzcyUyMDMlMjBDQSUyMDM/Y2VydGlmaWNhdGVSZXZvY2F0aW9uTGlzdDB6BggrBgEFBQcBAQRuMGwwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLmJ1eXBhc3Mubm8vb2NzcC9CUENsYXNzM0NBMzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC5idXlwYXNzLm5vL2NydC9CUENsYXNzM0NBMy5jZXIwDQYJKoZIhvcNAQELBQADggEBALS/sVxRLfnPGbwofV3Lhi8aIK0q6zJiexeNya18eOhhb/uIlFBY1OqsStfYHbG6HeB7kW8uEg2eekUOMZnq7hzVGhH6zl2gwfQijQ4Z2EGzwnMGAxo1ECzCom/U8A2Vedfna6dTJ/Be+wuwH9fAeIkLJ4XIGRTDiB6+5vVyNVx+ABkrUMxLvcFGDu7Tig0tCdhfkTNV604InVAcjVFNb1meyo/TjMmqx6TIYfjqCwi7EaThi3IKEB1Y+yxcU9TCweznyWobBfNOanq55vfemlTZm6+xooo3bAgsCp6AxF6ozVNpkSCRnGNjBICM2IqXiqNnsFwstfhB1zqwsmtaOGs=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIE8zCCA9ugAwIBAgILB60XOtlOKDyeNGYwDQYJKoZIhvcNAQELBQAwSzELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MR0wGwYDVQQDDBRCdXlwYXNzIENsYXNzIDMgQ0EgMzAeFw0xNTA1MTExMDIxMzVaFw0xODA1MTEyMTU5MDBaMIGJMQswCQYDVQQGEwJOTzEpMCcGA1UECgwgTkFTSk9OQUwgS09NTVVOSUtBU0pPTlNNWU5ESUdIRVQxEDAOBgNVBAsMB05ldHQvTkUxKTAnBgNVBAMMIE5BU0pPTkFMIEtPTU1VTklLQVNKT05TTVlORElHSEVUMRIwEAYDVQQFEwk5NzQ0NDY4NzEwggEfMA0GCSqGSIb3DQEBAQUAA4IBDAAwggEHAoH/AOLRUA+xKHVDzi9jvgJsoLnprCicC3znjuVw/r4Rh4NtMmJjfd+e1x17Um009EyPX8+gZpu3ra2Ie87uFQ2llKVByH9gflvapnb4wXevwkC6f6sdQHzDV2j3D67xQ8HulLSEcQN5FFH/AmN3r7S1WBUY8LuF5//ej0QJPEMiufojilJiQQPlixbCBFlCLmqlJ3kACZ87/xRI9TDYEsNDV0WJQJFP2Ex1V+yNP1RnaEiH2UCeXoY91nOpzltQFdAdRXsp8J4SRjP2Y7lIyGo6IWz5JVNjboXHrO/LfAx57x3eP70reYorBfZJufm3oYJ3uuBtFnD4eX0XiVey3e4LAgMBAAGjggGaMIIBljAJBgNVHRMEAjAAMB8GA1UdIwQYMBaAFMzD+Ae3nG16TvWnKx0F+bNHHJHRMB0GA1UdDgQWBBQQQqOR56u9hXZEtg3lIC/zsc0tCDAOBgNVHQ8BAf8EBAMCBkAwFQYDVR0gBA4wDDAKBghghEIBGgEDBTCBpQYDVR0fBIGdMIGaMC+gLaArhilodHRwOi8vY3JsLmJ1eXBhc3Mubm8vY3JsL0JQQ2xhc3MzQ0EzLmNybDBnoGWgY4ZhbGRhcDovL2xkYXAuYnV5cGFzcy5uby9kYz1CdXlwYXNzLGRjPU5PLENOPUJ1eXBhc3MlMjBDbGFzcyUyMDMlMjBDQSUyMDM/Y2VydGlmaWNhdGVSZXZvY2F0aW9uTGlzdDB6BggrBgEFBQcBAQRuMGwwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLmJ1eXBhc3Mubm8vb2NzcC9CUENsYXNzM0NBMzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC5idXlwYXNzLm5vL2NydC9CUENsYXNzM0NBMy5jZXIwDQYJKoZIhvcNAQELBQADggEBACheabFtAi3vC5m8cLjy1LEoigFQzzuVKiadkEpSS0tbIf61Jlr3avUxfUAMVA1yPMqWu+dxf0UvMBknMVHz92VKGZwqS1eR8KbsFj6HqAQb+xCQcVXrroQ+QGxM9/p6A1MS6nKIEO7SipUNbl1ww0YtFDyTa9FL/SHAZvGTEoRECVAl+uiu/HuvCoQFTzo2cYvwlDVbfb63SYwzukn992w8wbAh0MYeoGVO0stJ0oS+Utqk60g3jWjPy0cPLIV/x/wUxmgKRwaMuuUeN9EQcgj2Lnk7kPSmc+pT+mr+ZVHGvKEgS89HGDivgjYDeG8ocTV8n/nzKcVIUPXLVY4cBlg=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://www.nkom.no/TSL/NO_TSL.XML</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>NO</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">NASJONAL KOMMUNIKASJONSMYNDIGHET</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/NO</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDaTCCAlGgAwIBAgIJAOXz92Z7yWyiMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNVBAYTAlBMMSAwHgYDVQQKExdOYXRpb25hbCBCYW5rIG9mIFBvbGFuZDEcMBoGA1UEAxMTUG9saXNoIFRTTCBPcGVyYXRvcjAeFw0xNTA5MTQxMTMzNDBaFw0xNzA5MTMxMTMzNDBaME0xCzAJBgNVBAYTAlBMMSAwHgYDVQQKExdOYXRpb25hbCBCYW5rIG9mIFBvbGFuZDEcMBoGA1UEAxMTUG9saXNoIFRTTCBPcGVyYXRvcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOQzS6rDZWLH4OudgpJxkLQfh/3ZbrDRbFI69ElV1EwD7M8Sza2k7uMRsUQMaK5Ox58y5v7rBMWyVdaTLsnkemo7Coh1S85ai8bU5MUDrRqUUSvMk7IKwbBPA1WcTYkr0i17yEbiUbncz54XEmuYzuHiXjzWA0yCtkn7xL3vDnVLEYEBjmncuXG1AndibC9ZT9qYOT1D7QrxydK4S+3jmuL9saBFThDsrogqVcc4NoUdZiwxhbbKfGsIDXokfUTHURC1SzhG+IXkg/lAvpnx/p0jVNjiEbAWGB1T4u6Pl24xSw6b9cbX/QhaYFewcdJt2qSf+wBfIWxUBabtq1R9nNcCAwEAAaNMMEowCwYDVR0PBAQDAgeAMBEGA1UdJQQKMAgGBgQAkTcDADAJBgNVHRMEAjAAMB0GA1UdDgQWBBT6ZZUcqcsVEsQLnStCkPszCUqoxDANBgkqhkiG9w0BAQsFAAOCAQEAB1CDhQ/cTKp5Wy2Wf/VTI8qM9CsWG4P5XldKF8UxgRnbK9WvXfNShgGOaI/zd0HV22I7kxXNUJkWdNzUHgaBlpSvyuYSWQaYrLcqLzBFnnsl+NuZY/qVhXsHeQX2R7mygvnfueJq4B/37M4wCOC79F/iKuubooX9hJKhq78ii7EAsT7WxVZMo36xUMHGCxc9DSdwQPE5aAQBj7yIgksr5t7FJTy6DyN6GHmWvvbQ3TfgZG06COBrRPbXvhdtQAji5TxRlvvNzLNVBCtzzyQWR8iZIKvp4ILue+ARZnhQ+t0pkPFkG+x+3GYgzClzWwcilufcBpwx1Si20iIGKbnl4A==</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tDQpNSUlEYVRDQ0FsR2dBd0lCQWdJSkFPNEZ5RmJjSFJLK01BMEdDU3FHU0liM0RRRUJDd1VBTUUweEN6QUpCZ05WDQpCQVlUQWxCTU1TQXdIZ1lEVlFRS0V4ZE9ZWFJwYjI1aGJDQkNZVzVySUc5bUlGQnZiR0Z1WkRFY01Cb0dBMVVFDQpBeE1UVUc5c2FYTm9JRlJUVENCUGNHVnlZWFJ2Y2pBZUZ3MHhOakF4TWpBd09UQTJNRE5hRncweU1UQXhNVGd3DQpPVEEyTUROYU1FMHhDekFKQmdOVkJBWVRBbEJNTVNBd0hnWURWUVFLRXhkT1lYUnBiMjVoYkNCQ1lXNXJJRzltDQpJRkJ2YkdGdVpERWNNQm9HQTFVRUF4TVRVRzlzYVhOb0lGUlRUQ0JQY0dWeVlYUnZjakNDQVNJd0RRWUpLb1pJDQpodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ0VCQUtZcFlpSUZoT3J0ZHhNbms4UUpGTFowbkpjZmFGcFFrYnBGDQpkaVJiaXBXbzhLTjcyZGVIS0RQTDVRUk9GZXBqVjI2V25xWmc1SkRSZG9YN0R2QmppaTR0bGxwR1NZUkJBdk82DQpFRXJWMzJTYVRvVm5ydytiZ2xTZWlTaEtPUHNacEVOOEJYQTU5RXhDVXdEZFRTc3NPa2ZXZ2g0NmRUaXdLamo2DQphMVFKVG9OR256TllScVJtOUwzSlBxL05tR2ZQSHZaZ1hWajIyZnRtdkpMYVg1ZktQL0R5dUlQbzYzanZ0Um42DQp1VUtNVjFEMTZZdHBPSFNyTjNwZHUzVzF4QUhndStyL3FSNU95aEx4VWMwMTkyQmZxY1N5dm9GNklhN215OHpUDQp3V1RKT1p6RjhvMnpIL0M4WDlNK2VlRmQ4NE10bVdEM2hqSktXL2VFb2FiUVhhUFFvNDhDQXdFQUFhTk1NRW93DQpDd1lEVlIwUEJBUURBZ2VBTUJFR0ExVWRKUVFLTUFnR0JnUUFrVGNEQURBSkJnTlZIUk1FQWpBQU1CMEdBMVVkDQpEZ1FXQkJUNVRXZjZxODVUYzBldDJSSUQvZGY1eU9nTEV6QU5CZ2txaGtpRzl3MEJBUXNGQUFPQ0FRRUFOeTBrDQpVbm5rbjZqRVdXNHlzZUJSMWxTam1KZjRITW9NRUJLL3lxbWZKZTlEamxnQnBoek1Sa09NcXpsWWMwMmZ2UUorDQpTNmgvZERrdTFoaE9YN2Rvckd0bVoxTWwyMVZMYkE4K2I0eUlLSC9EbFFtVWoxNHdiUndyWGRxQVlJZ3ZFR3F1DQpwS3hkSW8zZVJqMlFPTGZML056dzlsVGV2MitGaFJxN2dBZ0MzWnNrL1YvZTVuTnViTS9LSnR3Q3pvSkdBd2tqDQpqTzJxemlhbFJ3N3ZUYW45TmpQY0ZyYVBnbXUvQ0N2Z25odU1jbHArSVQ3SnVyVTRKVk9ybTROQXBzejE2S3ltDQpnNmtjcVlpeXErSXFQalZZRjJ4ckhpblA4Z0I1RHY1eVlEZ2trZVc5WTdWTW9XVGxKRXIyZytURlI1dlB6bHgyDQpnL0RiVjA4SDJZZngvT29MZmc9PQ0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQ0KDQo=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>https://www.nccert.pl/tsl/PL_TSL.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>PL</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">National Bank of Poland</Name> -+ <Name xml:lang="pl">Narodowy Bank Polski</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/PL</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEhzCCA2+gAwIBAgIQPW8jjMRIcatWAnnZ/MBrMzANBgkqhkiG9w0BAQsFADBCMQswCQYDVQQGEwJQVDENMAsGA1UECgwEU0NFRTERMA8GA1UECwwIRUNFc3RhZG8xETAPBgNVBAMMCEVDQ0UgMDAxMB4XDTE1MDkyMzEwMDcyMVoXDTIwMDkyMzEwMDcyMVowZzEuMCwGA1UEAwwlUE9SVFVHVUVTRSBUUlVTVCBMSVNUIFNDSEVNRSBPUEVSQVRPUjEoMCYGA1UECgwfR2FiaW5ldGUgTmFjaW9uYWwgZGUgU2VndXJhbsOnYTELMAkGA1UEBhMCUFQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD40F9lHY68oq8UMkQHYNgS6HIYkelokkHlRpu74cybuValpoGRskLMg1QMGjPuxmr1EFF+jdd+zeOpk9rHGrWAsfDYFyxIcPVOSlcCmoenYfHxJaqSdyHVNB2oS5xkzZ/bIPUCupolRpiLauptJ4x4OK4Ep5pwzOsocGjkur19FCCVCQ3luDqyOiEgwz5Qie+JGQnzS/b03tQRnVq2gEjSilyCw+2PP27gmv6T+dIL9BIsr5uThNmgq6O1YdhItihTCAchmfXXCaBTIXattPvYQAIpEzNlLOs+keAeBkj8aeI8pC9/E4bTiWlQVT1lKQD8is6ExywWwe/YxFaUpAofAgMBAAGjggFSMIIBTjAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIGQDARBgNVHSUECjAIBgYEAJE3AwAwHQYDVR0OBBYEFJUfhchtKhfRNLlQLhVA9wMYCxMgMB8GA1UdIwQYMBaAFOMa2JoMNlrUDiOsDphvgVKeLl0FMDsGA1UdIAQ0MDIwMAYEVR0gADAoMCYGCCsGAQUFBwIBFhpodHRwOi8vd3d3LmVjY2UuZ292LnB0L2RwYzBmBggrBgEFBQcBAQRaMFgwIwYIKwYBBQUHMAGGF2h0dHA6Ly9vY3NwLmVjY2UuZ292LnB0MDEGCCsGAQUFBzAChiVodHRwOi8vdHJ1c3QuZWNjZS5nb3YucHQvZWNjZS0wMDEuY3J0MDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmxzLmVjY2UuZ292LnB0L2NybHMvY3JsLTAwMS5jcmwwDQYJKoZIhvcNAQELBQADggEBAIBQ0C4eP4ZozMkty6o6KWK71T+NrUwL+vdffIJFqL0zhYeeTfTk5MKP3wRSnstYgeOzgYs1GW0/elRtBs82fmLdzcAi397viJNSUVz9HGBqPVNR4yeXA7dO08VfQimuXKYb/ETlF1dxmkPtXTJPKp++nnbUDQ9WKio2OIPys9Vvj28KLR2nx1wVIrMlza3T6LC5qqjbgwyP0ghHSOSdpGvfGQBlBBTXXfliGcDOGHEqnlDxG7cHiPSe49k12vO2H99G4s8Di4CvDNI0bdhZMvRVmg7GunXXURn0/yTswQuMydft73f6a/gaZRjS1/+94R7EZXfIb8u855a/rMYoH5k=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEhzCCA2+gAwIBAgIQDJcks6HEEGlWBAfuOznaDDANBgkqhkiG9w0BAQsFADBCMQswCQYDVQQGEwJQVDENMAsGA1UECgwEU0NFRTERMA8GA1UECwwIRUNFc3RhZG8xETAPBgNVBAMMCEVDQ0UgMDAxMB4XDTE1MDkyNDE0MjU0OVoXDTE4MDkyNDE0MjU0OVowZzEuMCwGA1UEAwwlUE9SVFVHVUVTRSBUUlVTVCBMSVNUIFNDSEVNRSBPUEVSQVRPUjEoMCYGA1UECgwfR2FiaW5ldGUgTmFjaW9uYWwgZGUgU2VndXJhbsOnYTELMAkGA1UEBhMCUFQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0nAx4AAv12e97tcqc4/VAKTmcb541DSq/E64gEyqWVkdQbHlA+IQctcjLNOfH9lJoIqYQRJujJKieKTCK7UDMsvG8i+8xoXq5WiFXxFAr8F1RLaXH92IoXPx3sfYjXKmQhFNn5/v05Va5rILOStA5nX0PEmoWbncMYVN2Bg5SVTLsZbypT02qRu12FaCH0IAguOvx+Ch71OvutqojklJFWpjd83TxExkxZztWh5uhdUURwH/0paku0tFaNjBQbjDTYb6dKxPfmoCMjeQFKFwK6bKwxH+21FZ3Ucls7TyeFEpho8g1Ssb9ESGzwkOPjIj6SRm5bnAQVcCEM6nB0UiBAgMBAAGjggFSMIIBTjAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIGQDARBgNVHSUECjAIBgYEAJE3AwAwHQYDVR0OBBYEFBw+elLRULpJu8Z4E+QodKVSuv3LMB8GA1UdIwQYMBaAFOMa2JoMNlrUDiOsDphvgVKeLl0FMDsGA1UdIAQ0MDIwMAYEVR0gADAoMCYGCCsGAQUFBwIBFhpodHRwOi8vd3d3LmVjY2UuZ292LnB0L2RwYzBmBggrBgEFBQcBAQRaMFgwIwYIKwYBBQUHMAGGF2h0dHA6Ly9vY3NwLmVjY2UuZ292LnB0MDEGCCsGAQUFBzAChiVodHRwOi8vdHJ1c3QuZWNjZS5nb3YucHQvZWNjZS0wMDEuY3J0MDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmxzLmVjY2UuZ292LnB0L2NybHMvY3JsLTAwMS5jcmwwDQYJKoZIhvcNAQELBQADggEBALITw5agdwrEwIE1d6cU3q6ikbFCxWeIzMu192Vy2JpQyuaCgQxHZxhO/Kgv2njq2ouwvoQX+aC/k0SYbRmAKkGhGzXwySw9K/Fmw6amdna8W07xq3odv+5o9eLDpXXShyx1gIZrw6p1QCUFgOMgriOSFUI6UPguXMGRddre8IXpUD13lOa7jrjLKWXkV+fEYNvYlyqQvfe9rQulo92pVQ+TiqpAjX0G7AcEr3HKgAPIaB7E5a83QAQePH50UqChrYtOiwSFfrEkxEtJokIwYIH3MC0hIWEVkVtJNY1U9cizrW7BOxeM4qpSvIPHpTdltpD5TTD+/G4TOufEYFap8ug=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEhzCCA2+gAwIBAgIQDJcks6HEEGlWBAfuOznaDDANBgkqhkiG9w0BAQsFADBCMQswCQYDVQQGEwJQVDENMAsGA1UECgwEU0NFRTERMA8GA1UECwwIRUNFc3RhZG8xETAPBgNVBAMMCEVDQ0UgMDAxMB4XDTE1MDkyNDE0MjU0OVoXDTE4MDkyNDE0MjU0OVowZzEuMCwGA1UEAwwlUE9SVFVHVUVTRSBUUlVTVCBMSVNUIFNDSEVNRSBPUEVSQVRPUjEoMCYGA1UECgwfR2FiaW5ldGUgTmFjaW9uYWwgZGUgU2VndXJhbsOnYTELMAkGA1UEBhMCUFQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0nAx4AAv12e97tcqc4/VAKTmcb541DSq/E64gEyqWVkdQbHlA+IQctcjLNOfH9lJoIqYQRJujJKieKTCK7UDMsvG8i+8xoXq5WiFXxFAr8F1RLaXH92IoXPx3sfYjXKmQhFNn5/v05Va5rILOStA5nX0PEmoWbncMYVN2Bg5SVTLsZbypT02qRu12FaCH0IAguOvx+Ch71OvutqojklJFWpjd83TxExkxZztWh5uhdUURwH/0paku0tFaNjBQbjDTYb6dKxPfmoCMjeQFKFwK6bKwxH+21FZ3Ucls7TyeFEpho8g1Ssb9ESGzwkOPjIj6SRm5bnAQVcCEM6nB0UiBAgMBAAGjggFSMIIBTjAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIGQDARBgNVHSUECjAIBgYEAJE3AwAwHQYDVR0OBBYEFBw+elLRULpJu8Z4E+QodKVSuv3LMB8GA1UdIwQYMBaAFOMa2JoMNlrUDiOsDphvgVKeLl0FMDsGA1UdIAQ0MDIwMAYEVR0gADAoMCYGCCsGAQUFBwIBFhpodHRwOi8vd3d3LmVjY2UuZ292LnB0L2RwYzBmBggrBgEFBQcBAQRaMFgwIwYIKwYBBQUHMAGGF2h0dHA6Ly9vY3NwLmVjY2UuZ292LnB0MDEGCCsGAQUFBzAChiVodHRwOi8vdHJ1c3QuZWNjZS5nb3YucHQvZWNjZS0wMDEuY3J0MDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmxzLmVjY2UuZ292LnB0L2NybHMvY3JsLTAwMS5jcmwwDQYJKoZIhvcNAQELBQADggEBALITw5agdwrEwIE1d6cU3q6ikbFCxWeIzMu192Vy2JpQyuaCgQxHZxhO/Kgv2njq2ouwvoQX+aC/k0SYbRmAKkGhGzXwySw9K/Fmw6amdna8W07xq3odv+5o9eLDpXXShyx1gIZrw6p1QCUFgOMgriOSFUI6UPguXMGRddre8IXpUD13lOa7jrjLKWXkV+fEYNvYlyqQvfe9rQulo92pVQ+TiqpAjX0G7AcEr3HKgAPIaB7E5a83QAQePH50UqChrYtOiwSFfrEkxEtJokIwYIH3MC0hIWEVkVtJNY1U9cizrW7BOxeM4qpSvIPHpTdltpD5TTD+/G4TOufEYFap8ug=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>https://www.gns.gov.pt/media/1891/TSLPTHR.pdf</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>PT</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/pdf</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">National Security Cabinet of Portugal</Name> -+ <Name xml:lang="pt">Gabinete Nacional de Segurança</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/PT</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEhzCCA2+gAwIBAgIQPW8jjMRIcatWAnnZ/MBrMzANBgkqhkiG9w0BAQsFADBCMQswCQYDVQQGEwJQVDENMAsGA1UECgwEU0NFRTERMA8GA1UECwwIRUNFc3RhZG8xETAPBgNVBAMMCEVDQ0UgMDAxMB4XDTE1MDkyMzEwMDcyMVoXDTIwMDkyMzEwMDcyMVowZzEuMCwGA1UEAwwlUE9SVFVHVUVTRSBUUlVTVCBMSVNUIFNDSEVNRSBPUEVSQVRPUjEoMCYGA1UECgwfR2FiaW5ldGUgTmFjaW9uYWwgZGUgU2VndXJhbsOnYTELMAkGA1UEBhMCUFQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD40F9lHY68oq8UMkQHYNgS6HIYkelokkHlRpu74cybuValpoGRskLMg1QMGjPuxmr1EFF+jdd+zeOpk9rHGrWAsfDYFyxIcPVOSlcCmoenYfHxJaqSdyHVNB2oS5xkzZ/bIPUCupolRpiLauptJ4x4OK4Ep5pwzOsocGjkur19FCCVCQ3luDqyOiEgwz5Qie+JGQnzS/b03tQRnVq2gEjSilyCw+2PP27gmv6T+dIL9BIsr5uThNmgq6O1YdhItihTCAchmfXXCaBTIXattPvYQAIpEzNlLOs+keAeBkj8aeI8pC9/E4bTiWlQVT1lKQD8is6ExywWwe/YxFaUpAofAgMBAAGjggFSMIIBTjAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIGQDARBgNVHSUECjAIBgYEAJE3AwAwHQYDVR0OBBYEFJUfhchtKhfRNLlQLhVA9wMYCxMgMB8GA1UdIwQYMBaAFOMa2JoMNlrUDiOsDphvgVKeLl0FMDsGA1UdIAQ0MDIwMAYEVR0gADAoMCYGCCsGAQUFBwIBFhpodHRwOi8vd3d3LmVjY2UuZ292LnB0L2RwYzBmBggrBgEFBQcBAQRaMFgwIwYIKwYBBQUHMAGGF2h0dHA6Ly9vY3NwLmVjY2UuZ292LnB0MDEGCCsGAQUFBzAChiVodHRwOi8vdHJ1c3QuZWNjZS5nb3YucHQvZWNjZS0wMDEuY3J0MDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmxzLmVjY2UuZ292LnB0L2NybHMvY3JsLTAwMS5jcmwwDQYJKoZIhvcNAQELBQADggEBAIBQ0C4eP4ZozMkty6o6KWK71T+NrUwL+vdffIJFqL0zhYeeTfTk5MKP3wRSnstYgeOzgYs1GW0/elRtBs82fmLdzcAi397viJNSUVz9HGBqPVNR4yeXA7dO08VfQimuXKYb/ETlF1dxmkPtXTJPKp++nnbUDQ9WKio2OIPys9Vvj28KLR2nx1wVIrMlza3T6LC5qqjbgwyP0ghHSOSdpGvfGQBlBBTXXfliGcDOGHEqnlDxG7cHiPSe49k12vO2H99G4s8Di4CvDNI0bdhZMvRVmg7GunXXURn0/yTswQuMydft73f6a/gaZRjS1/+94R7EZXfIb8u855a/rMYoH5k=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEhzCCA2+gAwIBAgIQDJcks6HEEGlWBAfuOznaDDANBgkqhkiG9w0BAQsFADBCMQswCQYDVQQGEwJQVDENMAsGA1UECgwEU0NFRTERMA8GA1UECwwIRUNFc3RhZG8xETAPBgNVBAMMCEVDQ0UgMDAxMB4XDTE1MDkyNDE0MjU0OVoXDTE4MDkyNDE0MjU0OVowZzEuMCwGA1UEAwwlUE9SVFVHVUVTRSBUUlVTVCBMSVNUIFNDSEVNRSBPUEVSQVRPUjEoMCYGA1UECgwfR2FiaW5ldGUgTmFjaW9uYWwgZGUgU2VndXJhbsOnYTELMAkGA1UEBhMCUFQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0nAx4AAv12e97tcqc4/VAKTmcb541DSq/E64gEyqWVkdQbHlA+IQctcjLNOfH9lJoIqYQRJujJKieKTCK7UDMsvG8i+8xoXq5WiFXxFAr8F1RLaXH92IoXPx3sfYjXKmQhFNn5/v05Va5rILOStA5nX0PEmoWbncMYVN2Bg5SVTLsZbypT02qRu12FaCH0IAguOvx+Ch71OvutqojklJFWpjd83TxExkxZztWh5uhdUURwH/0paku0tFaNjBQbjDTYb6dKxPfmoCMjeQFKFwK6bKwxH+21FZ3Ucls7TyeFEpho8g1Ssb9ESGzwkOPjIj6SRm5bnAQVcCEM6nB0UiBAgMBAAGjggFSMIIBTjAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIGQDARBgNVHSUECjAIBgYEAJE3AwAwHQYDVR0OBBYEFBw+elLRULpJu8Z4E+QodKVSuv3LMB8GA1UdIwQYMBaAFOMa2JoMNlrUDiOsDphvgVKeLl0FMDsGA1UdIAQ0MDIwMAYEVR0gADAoMCYGCCsGAQUFBwIBFhpodHRwOi8vd3d3LmVjY2UuZ292LnB0L2RwYzBmBggrBgEFBQcBAQRaMFgwIwYIKwYBBQUHMAGGF2h0dHA6Ly9vY3NwLmVjY2UuZ292LnB0MDEGCCsGAQUFBzAChiVodHRwOi8vdHJ1c3QuZWNjZS5nb3YucHQvZWNjZS0wMDEuY3J0MDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmxzLmVjY2UuZ292LnB0L2NybHMvY3JsLTAwMS5jcmwwDQYJKoZIhvcNAQELBQADggEBALITw5agdwrEwIE1d6cU3q6ikbFCxWeIzMu192Vy2JpQyuaCgQxHZxhO/Kgv2njq2ouwvoQX+aC/k0SYbRmAKkGhGzXwySw9K/Fmw6amdna8W07xq3odv+5o9eLDpXXShyx1gIZrw6p1QCUFgOMgriOSFUI6UPguXMGRddre8IXpUD13lOa7jrjLKWXkV+fEYNvYlyqQvfe9rQulo92pVQ+TiqpAjX0G7AcEr3HKgAPIaB7E5a83QAQePH50UqChrYtOiwSFfrEkxEtJokIwYIH3MC0hIWEVkVtJNY1U9cizrW7BOxeM4qpSvIPHpTdltpD5TTD+/G4TOufEYFap8ug=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEhzCCA2+gAwIBAgIQDJcks6HEEGlWBAfuOznaDDANBgkqhkiG9w0BAQsFADBCMQswCQYDVQQGEwJQVDENMAsGA1UECgwEU0NFRTERMA8GA1UECwwIRUNFc3RhZG8xETAPBgNVBAMMCEVDQ0UgMDAxMB4XDTE1MDkyNDE0MjU0OVoXDTE4MDkyNDE0MjU0OVowZzEuMCwGA1UEAwwlUE9SVFVHVUVTRSBUUlVTVCBMSVNUIFNDSEVNRSBPUEVSQVRPUjEoMCYGA1UECgwfR2FiaW5ldGUgTmFjaW9uYWwgZGUgU2VndXJhbsOnYTELMAkGA1UEBhMCUFQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0nAx4AAv12e97tcqc4/VAKTmcb541DSq/E64gEyqWVkdQbHlA+IQctcjLNOfH9lJoIqYQRJujJKieKTCK7UDMsvG8i+8xoXq5WiFXxFAr8F1RLaXH92IoXPx3sfYjXKmQhFNn5/v05Va5rILOStA5nX0PEmoWbncMYVN2Bg5SVTLsZbypT02qRu12FaCH0IAguOvx+Ch71OvutqojklJFWpjd83TxExkxZztWh5uhdUURwH/0paku0tFaNjBQbjDTYb6dKxPfmoCMjeQFKFwK6bKwxH+21FZ3Ucls7TyeFEpho8g1Ssb9ESGzwkOPjIj6SRm5bnAQVcCEM6nB0UiBAgMBAAGjggFSMIIBTjAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIGQDARBgNVHSUECjAIBgYEAJE3AwAwHQYDVR0OBBYEFBw+elLRULpJu8Z4E+QodKVSuv3LMB8GA1UdIwQYMBaAFOMa2JoMNlrUDiOsDphvgVKeLl0FMDsGA1UdIAQ0MDIwMAYEVR0gADAoMCYGCCsGAQUFBwIBFhpodHRwOi8vd3d3LmVjY2UuZ292LnB0L2RwYzBmBggrBgEFBQcBAQRaMFgwIwYIKwYBBQUHMAGGF2h0dHA6Ly9vY3NwLmVjY2UuZ292LnB0MDEGCCsGAQUFBzAChiVodHRwOi8vdHJ1c3QuZWNjZS5nb3YucHQvZWNjZS0wMDEuY3J0MDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmxzLmVjY2UuZ292LnB0L2NybHMvY3JsLTAwMS5jcmwwDQYJKoZIhvcNAQELBQADggEBALITw5agdwrEwIE1d6cU3q6ikbFCxWeIzMu192Vy2JpQyuaCgQxHZxhO/Kgv2njq2ouwvoQX+aC/k0SYbRmAKkGhGzXwySw9K/Fmw6amdna8W07xq3odv+5o9eLDpXXShyx1gIZrw6p1QCUFgOMgriOSFUI6UPguXMGRddre8IXpUD13lOa7jrjLKWXkV+fEYNvYlyqQvfe9rQulo92pVQ+TiqpAjX0G7AcEr3HKgAPIaB7E5a83QAQePH50UqChrYtOiwSFfrEkxEtJokIwYIH3MC0hIWEVkVtJNY1U9cizrW7BOxeM4qpSvIPHpTdltpD5TTD+/G4TOufEYFap8ug=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>https://www.gns.gov.pt/media/1894/TSLPT.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>PT</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">National Security Cabinet of Portugal</Name> -+ <Name xml:lang="pt">Gabinete Nacional de Segurança</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/PT</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIFkjCCBHqgAwIBAgIQIAYFFnBjM4C9F3GV/MybHDANBgkqhkiG9w0BAQsFADB2MQswCQYDVQQGEwJSTzERMA8GA1UEChMIY2VydFNJR04xKTAnBgNVBAsTIGNlcnRTSUdOIFF1YWxpZmllZCBDQSBDbGFzcyAzIEcyMSkwJwYDVQQDEyBjZXJ0U0lHTiBRdWFsaWZpZWQgQ0EgQ2xhc3MgMyBHMjAeFw0xNTA4MjQxNDExMzFaFw0xNjA4MjQxNDExMzFaMIHEMQswCQYDVQQGEwJSTzEXMBUGA1UEBwwOTXVuLiBCdWN1cmVzdGkxNDAyBgNVBAoMK01JTklTVEVSVUwgUEVOVFJVIFNPQ0lFVEFURUEgSU5GT1JNQVRJT05BTEExFTATBgNVBAMMDENhcm1lbiBFbGlhbjEXMBUGA1UEBRMOMjAwNjA1MTY3MEVDMTQxFTATBgNVBCkMDENhcm1lbiBFbGlhbjEPMA0GA1UEKgwGQ2FybWVuMQ4wDAYDVQQEDAVFbGlhbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIr/xI7Gho+cwFAbeN+ZhE3d9YttjyiOWxpo0KlI1MknFHZIGBgSPD1bHytwp/R+vg5AJOyCQkCp31+KP+epppNwjrdNhHvGELGbXJnX7T3xHvqHZgyDdwKrOSXmTRt8MT/GXz/mk6+6WDgzyNP6k3AGbOGi7yQaufU3RNmTml1mt/QsCaYUxI19b+Uo6YFOB4Ou6FdLNk+pcI4whc5LGQRK2RpGt2veqdIRaHFWw/2rDQDpHSX+b/3fSnpzwRYDLQqF5FI1h57WD4VBlMdQ7+sXnQRkWmzlE52YziTSwrJpAiXRKwcs/hlzim8cOTNuIWF1sy1KtXeYAwMlyizJcOcCAwEAAaOCAcswggHHMG8GCCsGAQUFBwEBBGMwYTAjBggrBgEFBQcwAYYXaHR0cDovL29jc3AuY2VydHNpZ24ucm8wOgYIKwYBBQUHMAKGLmh0dHA6Ly93d3cuY2VydHNpZ24ucm8vY2VydGNybC9xdWFsaWZpZWRnMi5jcnQwDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCBLAwHwYDVR0jBBgwFoAUUDSeU3a5bdK3DB6Qg3Va7st0GIowHQYDVR0OBBYEFCUbQG7l1VMoByq2j3b21Vpw5FcMMEkGA1UdIARCMEAwPgYLKwYBBAGBwzkBAQMwLzAtBggrBgEFBQcCARYhaHR0cDovL3d3dy5jZXJ0c2lnbi5yby9yZXBvc2l0b3J5MDcGA1UdHwQwMC4wLKAqoCiGJmh0dHA6Ly9jcmwuY2VydHNpZ24ucm8vcXVhbGlmaWVkZzIuY3JsMEcGA1UdEQRAMD6gJQYKKwYBBAGCNxQCA6AXDBVjYXJtZW4uZWxpYW5AbXNpbmYucm+BFWNhcm1lbi5lbGlhbkBtc2luZi5ybzApBgNVHSUEIjAgBggrBgEFBQcDAgYKKwYBBAGCNxQCAgYIKwYBBQUHAwQwDQYJKoZIhvcNAQELBQADggEBAJpigM2rDWZ3lI/nZSkdxiUTpuDIw1jgwZqOiIvddGkQZT3ElU/06svJUBpqsJmjbG+yRvftmWIYqaqtdIEjMASF8K2kt8jbtr46uZksK+60x11DCvwxsKW55XSfAuY9u2B0TTvxzQ6BXR+wykryQdCIEwaN44Ka7l/XkZLtnxyWqBykkYAH8O0nj7BNuhBhZD579exh6pu5UIliTNNoQn2077qL172dTJxxNTnrvs4AQJJpWuOQTaAN/9QRZ5/C/c61Ta+O5Y8kPbv9Q69kkCCDDEntflkXaWrfzEjOOCXdLL8J4LHXYU2u1mB/J1fjyH8i5w7WYig/adHnB9dq4q4=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIF1DCCBLygAwIBAgIQIAYFFnBjM4f/kUNg/UnC1jANBgkqhkiG9w0BAQsFADB2MQswCQYDVQQGEwJSTzERMA8GA1UEChMIY2VydFNJR04xKTAnBgNVBAsTIGNlcnRTSUdOIFF1YWxpZmllZCBDQSBDbGFzcyAzIEcyMSkwJwYDVQQDEyBjZXJ0U0lHTiBRdWFsaWZpZWQgQ0EgQ2xhc3MgMyBHMjAeFw0xNTA4MjQxNDExMzFaFw0xNjA4MjQxNDExMzFaMIH+MQswCQYDVQQGEwJSTzEXMBUGA1UEBwwOTXVuLiBCdWN1cmVzdGkxNDAyBgNVBAoMK01JTklTVEVSVUwgUEVOVFJVIFNPQ0lFVEFURUEgSU5GT1JNQVRJT05BTEExJzAlBgNVBAMMHlJvbXVsdXMtUmFkdS1Db3JuZWxpdSBEdW1pdHJpdTEZMBcGA1UEBRMQMjAwNjA1MTY3MERDUlJDMTEpMCcGA1UEKQwgUm9tdWx1cy1SYWR1LUNvcm5lbGl1IEMgRHVtaXRyaXUxHjAcBgNVBCoMFVJvbXVsdXMtUmFkdS1Db3JuZWxpdTERMA8GA1UEBAwIRHVtaXRyaXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCP5uzh6yT71IooMhyVL2QcZE5lhIMUpqMNXqjNqHDe8SOAMRBkopPws9sS+jUQ2IKhQzPBTRYMAbBhQqdmnPzqGC4fpdZY3/5qrxRwHOzBHlrBawCOcpwaSy/J76ZgdWDJLWeXLtNmREFNELb9BuYH8DPWyHeE2lLSJO0OJbs1SMakX+BVt3/RmXbOCG3gYOjkGfq9sVhA9DC4PqR7KMfpb8nX7QQeJvtZdHQYaXaPajALX5qSuL1JT/KKUsqsMkqKh/nRxb1jH+qpRy6oa6gnij7XlukKUNy20aqENqniAT81L8ywDh1N/0l1IWY1tgSR10ClBfCD+UMQztoX5Vw3AgMBAAGjggHTMIIBzzBvBggrBgEFBQcBAQRjMGEwIwYIKwYBBQUHMAGGF2h0dHA6Ly9vY3NwLmNlcnRzaWduLnJvMDoGCCsGAQUFBzAChi5odHRwOi8vd3d3LmNlcnRzaWduLnJvL2NlcnRjcmwvcXVhbGlmaWVkZzIuY3J0MAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgSwMB8GA1UdIwQYMBaAFFA0nlN2uW3StwwekIN1Wu7LdBiKMB0GA1UdDgQWBBRZeYa2QYn3F5yuE1TERs0TsXz69DBJBgNVHSAEQjBAMD4GCysGAQQBgcM5AQEDMC8wLQYIKwYBBQUHAgEWIWh0dHA6Ly93d3cuY2VydHNpZ24ucm8vcmVwb3NpdG9yeTA3BgNVHR8EMDAuMCygKqAohiZodHRwOi8vY3JsLmNlcnRzaWduLnJvL3F1YWxpZmllZGcyLmNybDBPBgNVHREESDBGoCkGCisGAQQBgjcUAgOgGwwZcm9tdWx1cy5kdW1pdHJpdUBtc2luZi5yb4EZcm9tdWx1cy5kdW1pdHJpdUBtc2luZi5ybzApBgNVHSUEIjAgBggrBgEFBQcDAgYKKwYBBAGCNxQCAgYIKwYBBQUHAwQwDQYJKoZIhvcNAQELBQADggEBABKUmpbk8t1QyD37isj8ITmzuGQHFNOwAM2ZXJYk78c2YmkCY2luVPFvrfJ9ff3IqfqWS6RuMLQmNSPT84B3Bc+Y1j9QZgqNlVbkGrCBOe4GlojE9yXed7J4HCMYPT5iDaCdnD8XZQXYmUZmaSeJQoWkOTVG7zHoKO77VyK8kFltQAj+fQkI9sDdNVXfYlN+pgN2tQvPHbnNZo8hI00AJE9JWH0gHbIne7c7/1TU5ll4HWOZYVPRJV5DHe5mGBpflLxK8fpwXwEvxK1Yx1qKecpou5oBuqPVWy+iDv6Suv7VZLLEtFm+36wk3YoMWj3fxMFuckjxVFiiQYRZd10lRww=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://www.mcsi.ro/Minister/Domenii-de-activitate-ale-MCSI/Tehnologia-Informatiei/Servicii-electronice/Semnatura-electronica/TrustedList-versiunea-pdf</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>RO</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/pdf</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">MINISTRY FOR INFORMATION SOCIETY</Name> -+ <Name xml:lang="ro">MINISTERUL PENTRU SOCIETATEA INFORMATIONALA</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/RO</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIFkjCCBHqgAwIBAgIQIAYFFnBjM4C9F3GV/MybHDANBgkqhkiG9w0BAQsFADB2MQswCQYDVQQGEwJSTzERMA8GA1UEChMIY2VydFNJR04xKTAnBgNVBAsTIGNlcnRTSUdOIFF1YWxpZmllZCBDQSBDbGFzcyAzIEcyMSkwJwYDVQQDEyBjZXJ0U0lHTiBRdWFsaWZpZWQgQ0EgQ2xhc3MgMyBHMjAeFw0xNTA4MjQxNDExMzFaFw0xNjA4MjQxNDExMzFaMIHEMQswCQYDVQQGEwJSTzEXMBUGA1UEBwwOTXVuLiBCdWN1cmVzdGkxNDAyBgNVBAoMK01JTklTVEVSVUwgUEVOVFJVIFNPQ0lFVEFURUEgSU5GT1JNQVRJT05BTEExFTATBgNVBAMMDENhcm1lbiBFbGlhbjEXMBUGA1UEBRMOMjAwNjA1MTY3MEVDMTQxFTATBgNVBCkMDENhcm1lbiBFbGlhbjEPMA0GA1UEKgwGQ2FybWVuMQ4wDAYDVQQEDAVFbGlhbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIr/xI7Gho+cwFAbeN+ZhE3d9YttjyiOWxpo0KlI1MknFHZIGBgSPD1bHytwp/R+vg5AJOyCQkCp31+KP+epppNwjrdNhHvGELGbXJnX7T3xHvqHZgyDdwKrOSXmTRt8MT/GXz/mk6+6WDgzyNP6k3AGbOGi7yQaufU3RNmTml1mt/QsCaYUxI19b+Uo6YFOB4Ou6FdLNk+pcI4whc5LGQRK2RpGt2veqdIRaHFWw/2rDQDpHSX+b/3fSnpzwRYDLQqF5FI1h57WD4VBlMdQ7+sXnQRkWmzlE52YziTSwrJpAiXRKwcs/hlzim8cOTNuIWF1sy1KtXeYAwMlyizJcOcCAwEAAaOCAcswggHHMG8GCCsGAQUFBwEBBGMwYTAjBggrBgEFBQcwAYYXaHR0cDovL29jc3AuY2VydHNpZ24ucm8wOgYIKwYBBQUHMAKGLmh0dHA6Ly93d3cuY2VydHNpZ24ucm8vY2VydGNybC9xdWFsaWZpZWRnMi5jcnQwDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCBLAwHwYDVR0jBBgwFoAUUDSeU3a5bdK3DB6Qg3Va7st0GIowHQYDVR0OBBYEFCUbQG7l1VMoByq2j3b21Vpw5FcMMEkGA1UdIARCMEAwPgYLKwYBBAGBwzkBAQMwLzAtBggrBgEFBQcCARYhaHR0cDovL3d3dy5jZXJ0c2lnbi5yby9yZXBvc2l0b3J5MDcGA1UdHwQwMC4wLKAqoCiGJmh0dHA6Ly9jcmwuY2VydHNpZ24ucm8vcXVhbGlmaWVkZzIuY3JsMEcGA1UdEQRAMD6gJQYKKwYBBAGCNxQCA6AXDBVjYXJtZW4uZWxpYW5AbXNpbmYucm+BFWNhcm1lbi5lbGlhbkBtc2luZi5ybzApBgNVHSUEIjAgBggrBgEFBQcDAgYKKwYBBAGCNxQCAgYIKwYBBQUHAwQwDQYJKoZIhvcNAQELBQADggEBAJpigM2rDWZ3lI/nZSkdxiUTpuDIw1jgwZqOiIvddGkQZT3ElU/06svJUBpqsJmjbG+yRvftmWIYqaqtdIEjMASF8K2kt8jbtr46uZksK+60x11DCvwxsKW55XSfAuY9u2B0TTvxzQ6BXR+wykryQdCIEwaN44Ka7l/XkZLtnxyWqBykkYAH8O0nj7BNuhBhZD579exh6pu5UIliTNNoQn2077qL172dTJxxNTnrvs4AQJJpWuOQTaAN/9QRZ5/C/c61Ta+O5Y8kPbv9Q69kkCCDDEntflkXaWrfzEjOOCXdLL8J4LHXYU2u1mB/J1fjyH8i5w7WYig/adHnB9dq4q4=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIF1DCCBLygAwIBAgIQIAYFFnBjM4f/kUNg/UnC1jANBgkqhkiG9w0BAQsFADB2MQswCQYDVQQGEwJSTzERMA8GA1UEChMIY2VydFNJR04xKTAnBgNVBAsTIGNlcnRTSUdOIFF1YWxpZmllZCBDQSBDbGFzcyAzIEcyMSkwJwYDVQQDEyBjZXJ0U0lHTiBRdWFsaWZpZWQgQ0EgQ2xhc3MgMyBHMjAeFw0xNTA4MjQxNDExMzFaFw0xNjA4MjQxNDExMzFaMIH+MQswCQYDVQQGEwJSTzEXMBUGA1UEBwwOTXVuLiBCdWN1cmVzdGkxNDAyBgNVBAoMK01JTklTVEVSVUwgUEVOVFJVIFNPQ0lFVEFURUEgSU5GT1JNQVRJT05BTEExJzAlBgNVBAMMHlJvbXVsdXMtUmFkdS1Db3JuZWxpdSBEdW1pdHJpdTEZMBcGA1UEBRMQMjAwNjA1MTY3MERDUlJDMTEpMCcGA1UEKQwgUm9tdWx1cy1SYWR1LUNvcm5lbGl1IEMgRHVtaXRyaXUxHjAcBgNVBCoMFVJvbXVsdXMtUmFkdS1Db3JuZWxpdTERMA8GA1UEBAwIRHVtaXRyaXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCP5uzh6yT71IooMhyVL2QcZE5lhIMUpqMNXqjNqHDe8SOAMRBkopPws9sS+jUQ2IKhQzPBTRYMAbBhQqdmnPzqGC4fpdZY3/5qrxRwHOzBHlrBawCOcpwaSy/J76ZgdWDJLWeXLtNmREFNELb9BuYH8DPWyHeE2lLSJO0OJbs1SMakX+BVt3/RmXbOCG3gYOjkGfq9sVhA9DC4PqR7KMfpb8nX7QQeJvtZdHQYaXaPajALX5qSuL1JT/KKUsqsMkqKh/nRxb1jH+qpRy6oa6gnij7XlukKUNy20aqENqniAT81L8ywDh1N/0l1IWY1tgSR10ClBfCD+UMQztoX5Vw3AgMBAAGjggHTMIIBzzBvBggrBgEFBQcBAQRjMGEwIwYIKwYBBQUHMAGGF2h0dHA6Ly9vY3NwLmNlcnRzaWduLnJvMDoGCCsGAQUFBzAChi5odHRwOi8vd3d3LmNlcnRzaWduLnJvL2NlcnRjcmwvcXVhbGlmaWVkZzIuY3J0MAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgSwMB8GA1UdIwQYMBaAFFA0nlN2uW3StwwekIN1Wu7LdBiKMB0GA1UdDgQWBBRZeYa2QYn3F5yuE1TERs0TsXz69DBJBgNVHSAEQjBAMD4GCysGAQQBgcM5AQEDMC8wLQYIKwYBBQUHAgEWIWh0dHA6Ly93d3cuY2VydHNpZ24ucm8vcmVwb3NpdG9yeTA3BgNVHR8EMDAuMCygKqAohiZodHRwOi8vY3JsLmNlcnRzaWduLnJvL3F1YWxpZmllZGcyLmNybDBPBgNVHREESDBGoCkGCisGAQQBgjcUAgOgGwwZcm9tdWx1cy5kdW1pdHJpdUBtc2luZi5yb4EZcm9tdWx1cy5kdW1pdHJpdUBtc2luZi5ybzApBgNVHSUEIjAgBggrBgEFBQcDAgYKKwYBBAGCNxQCAgYIKwYBBQUHAwQwDQYJKoZIhvcNAQELBQADggEBABKUmpbk8t1QyD37isj8ITmzuGQHFNOwAM2ZXJYk78c2YmkCY2luVPFvrfJ9ff3IqfqWS6RuMLQmNSPT84B3Bc+Y1j9QZgqNlVbkGrCBOe4GlojE9yXed7J4HCMYPT5iDaCdnD8XZQXYmUZmaSeJQoWkOTVG7zHoKO77VyK8kFltQAj+fQkI9sDdNVXfYlN+pgN2tQvPHbnNZo8hI00AJE9JWH0gHbIne7c7/1TU5ll4HWOZYVPRJV5DHe5mGBpflLxK8fpwXwEvxK1Yx1qKecpou5oBuqPVWy+iDv6Suv7VZLLEtFm+36wk3YoMWj3fxMFuckjxVFiiQYRZd10lRww=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://www.mcsi.ro/Minister/Domenii-de-activitate-ale-MCSI/Tehnologia-Informatiei/Servicii-electronice/Semnatura-electronica/TrustedList-versiunea-xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>RO</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">MINISTRY FOR INFORMATION SOCIETY</Name> -+ <Name xml:lang="ro">MINISTERUL PENTRU SOCIETATEA INFORMATIONALA</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/RO</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDyTCCArGgAwIBAgIJAKRRAbnpt+1mMA0GCSqGSIb3DQEBCwUAMIGVMS4wLAYDVQQKEyVTd2VkaXNoIFBvc3QgYW5kIFRlbGVjb20gQWdlbmN5IChQVFMpMRIwEAYDVQQHEwlTdG9ja2hvbG0xEjAQBgNVBAgTCVN0b2NraG9sbTELMAkGA1UEBhMCU0UxLjAsBgNVBAMTJVN3ZWRpc2ggUG9zdCBhbmQgVGVsZWNvbSBBZ2VuY3kgKFBUUykwHhcNMTQxMjE5MDk1NDM2WhcNMTcxMjE4MDk1NDM2WjCBlTEuMCwGA1UEChMlU3dlZGlzaCBQb3N0IGFuZCBUZWxlY29tIEFnZW5jeSAoUFRTKTESMBAGA1UEBxMJU3RvY2tob2xtMRIwEAYDVQQIEwlTdG9ja2hvbG0xCzAJBgNVBAYTAlNFMS4wLAYDVQQDEyVTd2VkaXNoIFBvc3QgYW5kIFRlbGVjb20gQWdlbmN5IChQVFMpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtn8ADLkkBdFUWnKOYg1dDoJ7evZxP/jsqmFPVuZsOlAifQ6/NGWqyHMyj8r1/BmyEB/2WPLf+jrbtOKwSGtEHHkJ3nZnv1U9CBgIHDotzHrrEUI2b0r3ETaz80KsIlTZ5HaN0jPt+gfBETXCyT6H2cJ7uM5S/zhFeV7YMS2kzg9StgAMOQdZVAD4/2X1je97pBfH3AB4ZwLWsAA1OvQJ1NaE1gftqBuxiQkm5FOh8PnECmcT9dMveRLUKAbup5I1i1m3Ql9QvtyPv8E0/zSZUIN5XsRw9KXtgWema1oKSXBKyytg+XESSKm6BNYR2jTYQI8Vr0Z3MRl1zz9jcSh53QIDAQABoxowGDAJBgNVHRMEAjAAMAsGA1UdDwQEAwIGQDANBgkqhkiG9w0BAQsFAAOCAQEAiQ1Uns2aYVrlKthS8uf7gSkCI9hxmUOw1oryvNKu6q8OakYrbM2Z04+brJlzaX5gH1xFKC+6V6AaFHoAXP3G5is/BuGNhsRNwUluEsiqbxX6sKIQnyHyxhWDM3gfqHZwN4WDPb6W8UNfdMn5QabFi/MaecQgFCY505BJkBIKJA+apyj6zHYPSALjN4NewdheiCJ4jLoUpiJFKObbGNeZMcXqRRZaynOda9N8iKvACR4vScOYHG3HFn4NF0HnMbVh+0cyzzkzzjcd+oVsBQYLU9Oer+Axluj4E+AxvGmRfE/9S4VBctu1h/65iC5fcV8wdGdnE/UW1IDfk5UGXuWhmQ==</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDyTCCArGgAwIBAgIJALk/nqk36SvuMA0GCSqGSIb3DQEBCwUAMIGVMS4wLAYDVQQKEyVTd2VkaXNoIFBvc3QgYW5kIFRlbGVjb20gQWdlbmN5IChQVFMpMRIwEAYDVQQHEwlTdG9ja2hvbG0xEjAQBgNVBAgTCVN0b2NraG9sbTELMAkGA1UEBhMCU0UxLjAsBgNVBAMTJVN3ZWRpc2ggUG9zdCBhbmQgVGVsZWNvbSBBZ2VuY3kgKFBUUykwHhcNMTQwMjA0MTE1OTEyWhcNMTcwMjAzMTE1OTEyWjCBlTEuMCwGA1UEChMlU3dlZGlzaCBQb3N0IGFuZCBUZWxlY29tIEFnZW5jeSAoUFRTKTESMBAGA1UEBxMJU3RvY2tob2xtMRIwEAYDVQQIEwlTdG9ja2hvbG0xCzAJBgNVBAYTAlNFMS4wLAYDVQQDEyVTd2VkaXNoIFBvc3QgYW5kIFRlbGVjb20gQWdlbmN5IChQVFMpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArvBzVAFdzuT6LPDTqpo3dI8+zcH8UMA7uKubCsFmdiaeH643j1nfuUzbjQvQG+K6qrB3IRYec0zvWb6SnP58hTBHxvOf0eeRD7vxXomfeCO0FfhQnpBlCOAo8WDcFfYxCpUE1enyT02AhOkI0XRMibAP6EKWIjUvehKHBPi+OpfrDhxrMshrvV0+Cv/d07RevBNvXXmTUugaoo2q0/whl26rcawdEr3GbdxpNYonlzkwhKn5kNP/6Wo0xujxDX/6ZD6evFE2XS/ogPNqg6jOJifzglpIQx0fWyGYMKBiuz44K3SS1oCwiW6cIZlShvvwtQqOewE3zKp76LFDJlNZUQIDAQABoxowGDAJBgNVHRMEAjAAMAsGA1UdDwQEAwIGQDANBgkqhkiG9w0BAQsFAAOCAQEAdwopbzGOmPRe7d966zesuzckXA6eo1EgePlmaUTKkudZAKEODRwp0Cei+i2PKnTyZF1xY+BxEVcrVmU0syCDegv94qsnthJtx4QZmIlWVPBVq2AGDe+htnjD6QHzisuN5WNEH9g7JeUQmlXAsObPNxeldL++jp7/J9pWsD5WHlol0EbF5k4uYx8SlLfPQptXJFRckzA2P+JsJ/eg1GKF9RvP5N2PAC2mQDkyvl3D561Q3Vga1gU5Jl0idnzQhggcyyRTYOXxb9ZwDKpHvSUdIaAIDRe6626IGf4azK9Rflqppfo3YoiUpq5bkEx44377ho6RjnqMIYvOo348ZbcAJQ==</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://www.pts.se/upload/Ovrigt/Internet/Branschinformation/Trusted-List-SE-MR.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>SE</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Swedish Post and Telecom Agency (PTS)</Name> -+ <Name xml:lang="sv">Post- och telestyrelsen (PTS)</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/SE</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIFdDCCBFygAwIBAgIEOl6PRjANBgkqhkiG9w0BAQUFADA9MQswCQYDVQQGEwJzaTEbMBkGA1UEChMSc3RhdGUtaW5zdGl0dXRpb25zMREwDwYDVQQLEwhzaWdvdi1jYTAeFw0xMzAzMDUxMDU2MDZaFw0xODAzMDUxMzI4MzVaMIGJMQswCQYDVQQGEwJzaTEbMBkGA1UEChMSc3RhdGUtaW5zdGl0dXRpb25zMRkwFwYDVQQLExB3ZWItY2VydGlmaWNhdGVzMRMwEQYDVQQLEwpHb3Zlcm5tZW50MS0wFAYDVQQFEw0xMjM1MTc0MjE0MDI3MBUGA1UEAxMORGltaXRyaWogU2themEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCJxPypF9ZVssjvPT/he9cZ/DdBn3htrapLJqHISc1ylop1CpkL0fbPTL9xK3JnaMzzmucbeTkwj2fyEaluP2bl1+ElpMWDYUq59mDOGvpB5KaJvTCXGUdf3rZTFSVOf7WarhI9uR25sjZg1wwVKGJ9VTqVtAlD5WBsIyT2CN1xWj3DXy+faqGtYbd/4mpzMW+qvTJQ9act6rlmTXJXwOVBTYwVEciTqX+IMX1nIn93FEOl6Q9BQeAYFe8pVXbTjoveY7KIE2SyWETogYplMDesK3hWB6cGfnWD05+Vbj78hKFyxSjoKTJegxzk6+8nGy0dzkjup1nlpTrjDBr1Zgt9AgMBAAGjggItMIICKTAOBgNVHQ8BAf8EBAMCBaAwSgYDVR0gBEMwQTA1BgorBgEEAa9ZAQcBMCcwJQYIKwYBBQUHAgEWGWh0dHA6Ly93d3cuY2EuZ292LnNpL2Nwcy8wCAYGBACLMAEBMCIGCCsGAQUFBwEDBBYwFDAIBgYEAI5GAQEwCAYGBACORgEEMCAGA1UdEQQZMBeBFWRpbWl0cmlqLnNrYXphQGdvdi5zaTCB8QYDVR0fBIHpMIHmMFWgU6BRpE8wTTELMAkGA1UEBhMCc2kxGzAZBgNVBAoTEnN0YXRlLWluc3RpdHV0aW9uczERMA8GA1UECxMIc2lnb3YtY2ExDjAMBgNVBAMTBUNSTDQxMIGMoIGJoIGGhldsZGFwOi8veDUwMC5nb3Yuc2kvb3U9c2lnb3YtY2Esbz1zdGF0ZS1pbnN0aXR1dGlvbnMsYz1zaT9jZXJ0aWZpY2F0ZVJldm9jYXRpb25MaXN0P2Jhc2WGK2h0dHA6Ly93d3cuc2lnb3YtY2EuZ292LnNpL2NybC9zaWdvdi1jYS5jcmwwKwYDVR0QBCQwIoAPMjAxMzAzMDUxMDU2MDZagQ8yMDE4MDMwNTEzMjgzNVowHwYDVR0jBBgwFoAUHvjUU2uzgwbpBAZXAvmlv8ZYPHIwHQYDVR0OBBYEFPkW6/pilxObPEzBAucEf/wHqwgdMAkGA1UdEwQCMAAwGQYJKoZIhvZ9B0EABAwwChsEVjcuMQMCA6gwDQYJKoZIhvcNAQEFBQADggEBAI+3jSydwmTfTuFJxIys5PFZGzWNX8pCcyyuYFnbPbsnWwVMA1wE/FazkN51U0E2nTsYlooal4uiZ0u5jgbXW7wBvAIept/mJNyXXLd/il5JiB0Bz76GsGNmw1DoX2lvV06x39NI9X3+ea2rp7L56co3kVJPmFbJImyYc5OK5H9dXjGpIcxzVyWXNoUSbhVZpljIw5Tka+c5/G0gE49o3PiexXH2fziGBAmbICn+eX6+zeSo80OB0DiPRMD0s31IitQfEv1N3H+lz21Pa8gKEKpKw7Ns7b4nMGfw8WQyiVHNNSo95RlCaHPFfeFR5vkDuUayHqGwErB1Zdx8AIjzR+w=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIFdDCCBFygAwIBAgIEOl5EOjANBgkqhkiG9w0BAQUFADA9MQswCQYDVQQGEwJzaTEbMBkGA1UEChMSc3RhdGUtaW5zdGl0dXRpb25zMREwDwYDVQQLEwhzaWdvdi1jYTAeFw0xMTEyMDgwOTU4MzhaFw0xNjEyMDgyMTQxNDFaMIGJMQswCQYDVQQGEwJzaTEbMBkGA1UEChMSc3RhdGUtaW5zdGl0dXRpb25zMRkwFwYDVQQLExB3ZWItY2VydGlmaWNhdGVzMRMwEQYDVQQLEwpHb3Zlcm5tZW50MS0wFAYDVQQFEw0xMjM0NjYyNjE0MDQ2MBUGA1UEAxMOTWFydXNrYSBEYW1qYW4wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCMrQtDhrYKxtQeHBVfhfkB9q6axI0SmPwcIRqEFGWfhnPhQwvPa8vSrE3SBrJnKx3bxLHdw/hzM8hDfhsQM5rwDYN8qfVv1qnttITRlBZqd7qSzQeD/QegjC2yZMIun/e/Gjz450+oXoGlgiB9Ir9DRuqCDq/lmMuftjYUc8uWQj/YwpmQrJNqDymbTInuclDM8zB5eUc6x/7jWs2QxdleY0rOR3H9GAUFCUMQjSYbvZfy+ptCGB1adST4/5o6DBOBpKakbz4tmrroUYqf7YBXzImiPCcyQxYFADGUboWWQ8QYiVPgED37/wkO+XGeYehuQ0jY61DDjc9YubxMUTbtAgMBAAGjggItMIICKTAOBgNVHQ8BAf8EBAMCBaAwSgYDVR0gBEMwQTA1BgorBgEEAa9ZAQcBMCcwJQYIKwYBBQUHAgEWGWh0dHA6Ly93d3cuY2EuZ292LnNpL2Nwcy8wCAYGBACLMAEBMCIGCCsGAQUFBwEDBBYwFDAIBgYEAI5GAQEwCAYGBACORgEEMCAGA1UdEQQZMBeBFW1hcnVza2EuZGFtamFuQGdvdi5zaTCB8QYDVR0fBIHpMIHmMFWgU6BRpE8wTTELMAkGA1UEBhMCc2kxGzAZBgNVBAoTEnN0YXRlLWluc3RpdHV0aW9uczERMA8GA1UECxMIc2lnb3YtY2ExDjAMBgNVBAMTBUNSTDM0MIGMoIGJoIGGhldsZGFwOi8veDUwMC5nb3Yuc2kvb3U9c2lnb3YtY2Esbz1zdGF0ZS1pbnN0aXR1dGlvbnMsYz1zaT9jZXJ0aWZpY2F0ZVJldm9jYXRpb25MaXN0P2Jhc2WGK2h0dHA6Ly93d3cuc2lnb3YtY2EuZ292LnNpL2NybC9zaWdvdi1jYS5jcmwwKwYDVR0QBCQwIoAPMjAxMTEyMDgwOTU4MzhagQ8yMDE2MTIwODIxNDE0MVowHwYDVR0jBBgwFoAUHvjUU2uzgwbpBAZXAvmlv8ZYPHIwHQYDVR0OBBYEFO2tqCIZmlWRrpJXC+r5nVGPwNaAMAkGA1UdEwQCMAAwGQYJKoZIhvZ9B0EABAwwChsEVjcuMQMCA6gwDQYJKoZIhvcNAQEFBQADggEBAJZvcjQy6OXcg/aHJRCwiKxyUZSXrazeyvBmkrrLK+2vMNyaFsJWQIIEKb9tWCrrQOXsBhzgGXLh5kr+Bt89pMANUYXanP5dlZo3A1h0xvfvGaKOhcZclZz+h4IGc/SBy9Xd/BJa9ttIqdSwH+8k29N4YhM9AIVb3vBszDDgLTU2xuFMIqDX+rbZnF9PmFbtKzGQjevOqG/4y61sZSa7pgPjhxTj4mqpK/AN40giiaRNJv+z3E9Xh71S4CriSeBW2GJsPS+v7dEw775fWPuQJEvDYZ1X754lmFp3RTOtlIqQTxCgajRF4O8mWEYb2BH3N64e8yEoaxvVHdbV9aUQ0Mg=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://www.mizks.gov.si/fileadmin/mizks.gov.si/pageuploads/Storitve/Info_druzba/Overitelji/SI_TL.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>SI</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Republic of Slovenia, Ministry of Education, Science and Sport </Name> -+ <Name xml:lang="sl">Republika Slovenija, Ministrstvo za izobraževanje, znanost in šport </Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/SI</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://ep.nbusr.sk/kca/tsl/tsl_hrf.zip</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>SK</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/pdf</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">NATIONAL SECURITY AUTHORITY</Name> -+ <Name xml:lang="sk">NÁRODNÝ BEZPEČNOSTNÝ ÚRAD</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/SK</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://ep.nbusr.sk/kca/tsl/tsl.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>SK</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">NATIONAL SECURITY AUTHORITY</Name> -+ <Name xml:lang="sk">NÁRODNÝ BEZPEČNOSTNÝ ÚRAD</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/SK</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDdzCCAl+gAwIBAgIFFATw0YMwDQYJKoZIhvcNAQELBQAwSzELMAkGA1UEBhMCVUsxGDAWBgNVBAoMD3RTY2hlbWUgTGltaXRlZDEMMAoGA1UECwwDUEtJMRQwEgYDVQQDDAtUU0wgU2lnbmluZzAeFw0xNDAyMjAwMDAwMDBaFw0xNzAyMjAwMDAwMDBaMEsxCzAJBgNVBAYTAlVLMRgwFgYDVQQKDA90U2NoZW1lIExpbWl0ZWQxDDAKBgNVBAsMA1BLSTEUMBIGA1UEAwwLVFNMIFNpZ25pbmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDKDMc2PgyQPNCRsjk2F/Lt7THy0lDmfFvYDiu8U1+5NN4Cdh/JKq87GlcqUWOK4/CS/evFqWXZQrHMeyFqG17zbTSheCqER0PwuYELgKLRTC9V9vX8GbVQ3Qh/JySDB+yiIR4dXNBku8Gb7zjD0OxykAyHyWlf/4i3T1dpJZpXqMKweT5N7+d2XT+Lzn7iNJA/VN23uYyQf7o4YGdVvvZx5ApxOQx5sSXEtprELYTy7C06QGAiE0Q9x5MjnsNMyWsrZn7T6kWEM0Ks4R/CFOlj5iG3a1kNSSWgVSBfmyW4U5MV2RzOHUFRuZT8q6UfKzP+0QAaQ42X6hbupFwNWMCPAgMBAAGjYjBgMB0GA1UdDgQWBBQUF9oFLo/KTZ+wgaTuLp8QixYGUjAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIGwDARBgNVHSAECjAIMAYGBFUdIAAwEQYDVR0lBAowCAYGBACRNwMAMA0GCSqGSIb3DQEBCwUAA4IBAQCfA8F1bhDJotAv1AqNVh8ApFQZibSBiIDpctqR63DfDQjWupeoAr7TCDEZqOLgDdBTMiOBKgXVGc/p+hmSbxR+EukBix96Q+RfVgGoMwHCb8L3h/g2Gp0QFXDMGltPcXQDAJ4WofFmze7CfO/Bv9vLeGn0Xy1Xou7QjcCMnfGekf3XPX/U8m/tuxm80wlNIn9ZWfPHKoobsj3OerZtI2HgWU1ihDLD+aybZ5Imfk79zFj4ZshAJXDDhDEsCV/XgUTZzg9DJguztve+cnAGdx1x/BomvFEUgkAbSbsmwu9SFKj0nOb6ksvj3yYU0hTZrpIwQlGdxj4wJ5g6OCJFUob5</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDdzCCAl+gAwIBAgIFFJV9MCIwDQYJKoZIhvcNAQELBQAwSzELMAkGA1UEBhMCVUsxGDAWBgNVBAoMD3RTY2hlbWUgTGltaXRlZDEMMAoGA1UECwwDUEtJMRQwEgYDVQQDDAtUU0wgU2lnbmluZzAeFw0xNDA4MDgwMDAwMDBaFw0xNzA4MDgwMDAwMDBaMEsxCzAJBgNVBAYTAlVLMRgwFgYDVQQKDA90U2NoZW1lIExpbWl0ZWQxDDAKBgNVBAsMA1BLSTEUMBIGA1UEAwwLVFNMIFNpZ25pbmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCy58lOvYY2WC2k1sHf6KFkeHUmEMGR/dmU4hGPHmibbnOcqCW5kQQ1uewp+6tkUt1OqtVCrVI4NtzSNKWKqS79SoIKe7r6hJ2yIskY3VlGQrk2wI4nW2QyOBX3Pum+RIQdqrYz/OrSWe3NCiHwZBmW0a7WMVWOuiNBZN3rtC+kUXDdgBXVaqcsKnU3HUMKfeJ0xYnAOnqJwX5/9EoHdeAr3xnCRT/bJO3jkm4FuTAFHWLWfdJQvMZ+Z0+TDAPZj9t9+5RKwdMc0f4Nou9SYywLRnv82MIH69EfUswAHMdM+3kcg16VL3d0gUxy3qOnsh+TxdW3uBfB62eJPJv1gwXBAgMBAAGjYjBgMB0GA1UdDgQWBBQ38XfUZwvT/+xQFcoUt8NuodH4tTAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIGwDARBgNVHSAECjAIMAYGBFUdIAAwEQYDVR0lBAowCAYGBACRNwMAMA0GCSqGSIb3DQEBCwUAA4IBAQAFK6WJ8yL8aa+c6JV3F/N6JWwKNcjzHYaI+WgWsltQOUtrrPMf9zBMpTq3AeNHYfNB1+uTRaFmtLA0XIBYcfu7J0CsDXhl5nUS4Ev5qcSzHyupuZQ2j+zLD9uCFbiDaa6Y64CQ8jbhD7ZemgA1KdmmR3+uadjFu13eZ+ZyfwyeYH4zMiqOkXCZ1eNwUrzAhhhPAvR6CFYv6Ea1/2Y6TXCJBEB0QBrXPs6q2oYzDOcwE0kfMMcWbA86dHpMkCJ22wUypqiiXCmPDkiCdbUE+QG2+fOnkiSQOtp7uncr1EVyb0hxmDD6LOlGQIl73SoeA1C5FQv5CTwyWaHSAt2UK2Ac</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://www.tscheme.org/UK_TSL/HR_TSL-UKsigned.pdf</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>UK</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/pdf</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">tScheme Limited</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/UK</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDdzCCAl+gAwIBAgIFFATw0YMwDQYJKoZIhvcNAQELBQAwSzELMAkGA1UEBhMCVUsxGDAWBgNVBAoMD3RTY2hlbWUgTGltaXRlZDEMMAoGA1UECwwDUEtJMRQwEgYDVQQDDAtUU0wgU2lnbmluZzAeFw0xNDAyMjAwMDAwMDBaFw0xNzAyMjAwMDAwMDBaMEsxCzAJBgNVBAYTAlVLMRgwFgYDVQQKDA90U2NoZW1lIExpbWl0ZWQxDDAKBgNVBAsMA1BLSTEUMBIGA1UEAwwLVFNMIFNpZ25pbmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDKDMc2PgyQPNCRsjk2F/Lt7THy0lDmfFvYDiu8U1+5NN4Cdh/JKq87GlcqUWOK4/CS/evFqWXZQrHMeyFqG17zbTSheCqER0PwuYELgKLRTC9V9vX8GbVQ3Qh/JySDB+yiIR4dXNBku8Gb7zjD0OxykAyHyWlf/4i3T1dpJZpXqMKweT5N7+d2XT+Lzn7iNJA/VN23uYyQf7o4YGdVvvZx5ApxOQx5sSXEtprELYTy7C06QGAiE0Q9x5MjnsNMyWsrZn7T6kWEM0Ks4R/CFOlj5iG3a1kNSSWgVSBfmyW4U5MV2RzOHUFRuZT8q6UfKzP+0QAaQ42X6hbupFwNWMCPAgMBAAGjYjBgMB0GA1UdDgQWBBQUF9oFLo/KTZ+wgaTuLp8QixYGUjAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIGwDARBgNVHSAECjAIMAYGBFUdIAAwEQYDVR0lBAowCAYGBACRNwMAMA0GCSqGSIb3DQEBCwUAA4IBAQCfA8F1bhDJotAv1AqNVh8ApFQZibSBiIDpctqR63DfDQjWupeoAr7TCDEZqOLgDdBTMiOBKgXVGc/p+hmSbxR+EukBix96Q+RfVgGoMwHCb8L3h/g2Gp0QFXDMGltPcXQDAJ4WofFmze7CfO/Bv9vLeGn0Xy1Xou7QjcCMnfGekf3XPX/U8m/tuxm80wlNIn9ZWfPHKoobsj3OerZtI2HgWU1ihDLD+aybZ5Imfk79zFj4ZshAJXDDhDEsCV/XgUTZzg9DJguztve+cnAGdx1x/BomvFEUgkAbSbsmwu9SFKj0nOb6ksvj3yYU0hTZrpIwQlGdxj4wJ5g6OCJFUob5</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDdzCCAl+gAwIBAgIFFJV9MCIwDQYJKoZIhvcNAQELBQAwSzELMAkGA1UEBhMCVUsxGDAWBgNVBAoMD3RTY2hlbWUgTGltaXRlZDEMMAoGA1UECwwDUEtJMRQwEgYDVQQDDAtUU0wgU2lnbmluZzAeFw0xNDA4MDgwMDAwMDBaFw0xNzA4MDgwMDAwMDBaMEsxCzAJBgNVBAYTAlVLMRgwFgYDVQQKDA90U2NoZW1lIExpbWl0ZWQxDDAKBgNVBAsMA1BLSTEUMBIGA1UEAwwLVFNMIFNpZ25pbmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCy58lOvYY2WC2k1sHf6KFkeHUmEMGR/dmU4hGPHmibbnOcqCW5kQQ1uewp+6tkUt1OqtVCrVI4NtzSNKWKqS79SoIKe7r6hJ2yIskY3VlGQrk2wI4nW2QyOBX3Pum+RIQdqrYz/OrSWe3NCiHwZBmW0a7WMVWOuiNBZN3rtC+kUXDdgBXVaqcsKnU3HUMKfeJ0xYnAOnqJwX5/9EoHdeAr3xnCRT/bJO3jkm4FuTAFHWLWfdJQvMZ+Z0+TDAPZj9t9+5RKwdMc0f4Nou9SYywLRnv82MIH69EfUswAHMdM+3kcg16VL3d0gUxy3qOnsh+TxdW3uBfB62eJPJv1gwXBAgMBAAGjYjBgMB0GA1UdDgQWBBQ38XfUZwvT/+xQFcoUt8NuodH4tTAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIGwDARBgNVHSAECjAIMAYGBFUdIAAwEQYDVR0lBAowCAYGBACRNwMAMA0GCSqGSIb3DQEBCwUAA4IBAQAFK6WJ8yL8aa+c6JV3F/N6JWwKNcjzHYaI+WgWsltQOUtrrPMf9zBMpTq3AeNHYfNB1+uTRaFmtLA0XIBYcfu7J0CsDXhl5nUS4Ev5qcSzHyupuZQ2j+zLD9uCFbiDaa6Y64CQ8jbhD7ZemgA1KdmmR3+uadjFu13eZ+ZyfwyeYH4zMiqOkXCZ1eNwUrzAhhhPAvR6CFYv6Ea1/2Y6TXCJBEB0QBrXPs6q2oYzDOcwE0kfMMcWbA86dHpMkCJ22wUypqiiXCmPDkiCdbUE+QG2+fOnkiSQOtp7uncr1EVyb0hxmDD6LOlGQIl73SoeA1C5FQv5CTwyWaHSAt2UK2Ac</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://www.tscheme.org/UK_TSL/TSL-UKsigned.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>UK</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">tScheme Limited</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/UK</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ </PointersToOtherTSL> -+ <ListIssueDateTime>2016-04-08T11:15:22Z</ListIssueDateTime> -+ <NextUpdate> -+ <dateTime>2016-09-08T11:15:22Z</dateTime> -+ </NextUpdate> -+ <DistributionPoints> -+ <URI>https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl-mp.xml</URI> -+ </DistributionPoints> -+ </SchemeInformation> -+<ds:Signature Id="Signature_1460109636374" xmlns:ds="http://www.w3.org/2000/09/xmldsig#"><ds:SignedInfo Id="Signature_1460109636374-SignedInfo"><ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/><ds:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/><ds:Reference URI="" Id="Signature_1460109636374-Reference-0"><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/><ds:DigestValue>37nyW1VCJ9iJU1HQ1gha3oqrWWH0ROCx5SXv5W4VKKo=</ds:DigestValue></ds:Reference><ds:Reference URI="#Signature_1460109636374_SignedProperties" Type="http://uri.etsi.org/01903#SignedProperties"><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/><ds:DigestValue>ypmo0YajX2NiF1H2NUkLxNLB8VeDlcIbuGRcZK3Az78=</ds:DigestValue></ds:Reference></ds:SignedInfo><ds:SignatureValue Id="Signature_1460109636374_Value">SW5cMZ+lDTJg+s4PdiUdy1LN/S312cFgSAemeFn5bT+retkMQFdypn8G4wZ/YtkXHmfmx4MBKbjob5o7WS3/7LfsyAbs1QDLKB5CcuPZ6zh6X7uM3+NKRcfSasQ0Mt9/YdO8Cn6qweDI5T6mzU1EgknTOx/gu9S9l0I9BDagEEjL8/pG3qPLsevmz4KoK/mfyj/yJ2U2/muV/66HlMNIIVJjyos8CHpCIE5qFef6PjLxLZ4TYG+v/8F2vyhDx86um+nFPGf3SuZMNg6akXDqoKAftbK9w0xjDwKVJUcckG9XrKRJC3JhIjEwiZL5PJYhulk+wmExexKb2REkbuOmUg==</ds:SignatureValue><ds:KeyInfo><ds:X509Data><ds:X509Certificate>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</ds:X509Certificate></ds:X509Data></ds:KeyInfo><ds:Object><xades:QualifyingProperties Target="#Signature_1460109636374" xmlns:xades="http://uri.etsi.org/01903/v1.3.2#"><xades:SignedProperties Id="Signature_1460109636374_SignedProperties"><xades:SignedSignatureProperties><xades:SigningTime>2016-04-08T10:00:36.390Z</xades:SigningTime><xades:SigningCertificate><xades:Cert><xades:CertDigest><ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><ds:DigestValue>1URWKQVwWCb9HhMyozwlaYg1ejw=</ds:DigestValue></xades:CertDigest><xades:IssuerSerial><ds:X509IssuerName>CN=QuoVadis EU Issuing Certification Authority G2,OU=Issuing Certification Authority,O=QuoVadis Trustlink B.V.,C=NL</ds:X509IssuerName><ds:X509SerialNumber>694395474722160626358886281620874695673047986886</ds:X509SerialNumber></xades:IssuerSerial></xades:Cert></xades:SigningCertificate></xades:SignedSignatureProperties><xades:SignedDataObjectProperties><xades:DataObjectFormat ObjectReference="#Signature_1460109636374-Reference-0"><xades:MimeType>text/xml</xades:MimeType></xades:DataObjectFormat></xades:SignedDataObjectProperties></xades:SignedProperties></xades:QualifyingProperties></ds:Object></ds:Signature></TrustServiceStatusList> -diff -ruN a/client/TSL.qrc b/client/TSL.qrc ---- a/client/TSL.qrc 1970-01-01 03:00:00.000000000 +0300 -+++ b/client/TSL.qrc 2016-04-27 10:17:48.915014559 +0300 -@@ -0,0 +1 @@ -+<RCC><qresource prefix="TSL"><file>tl-mp.xml</file><file>EE.xml</file></qresource></RCC> diff --git a/pkgs/tools/security/qdigidoc/default.nix b/pkgs/tools/security/qdigidoc/default.nix index 8d520f90c6521..398f88ccfb6b2 100644 --- a/pkgs/tools/security/qdigidoc/default.nix +++ b/pkgs/tools/security/qdigidoc/default.nix @@ -1,43 +1,54 @@ -{ stdenv, fetchurl, cmake, ccid, qttools, qttranslations, pkgconfig, pcsclite -, hicolor-icon-theme, libdigidocpp, opensc, shared-mime-info, openldap -, gettext, desktop-file-utils, makeWrapper }: +{ stdenv, fetchgit, fetchurl, cmake, darkhttpd, gettext, makeWrapper, pkgconfig +, libdigidocpp, opensc, openldap, openssl, pcsclite, qtbase, qttranslations }: stdenv.mkDerivation rec { - - version = "3.12.0.1442"; name = "qdigidoc-${version}"; + version = "3.13.6"; + + src = fetchgit { + url = "https://github.com/open-eid/qdigidoc"; + rev = "v${version}"; + sha256 = "1qq9fgvkc7fi37ly3kgxksrm4m5rxk9k5s5cig8z0cszsfk6h9lx"; + fetchSubmodules = true; + }; - src = fetchurl { - url = "https://installer.id.ee/media/ubuntu/pool/main/q/qdigidoc/qdigidoc_3.12.0.1442.orig.tar.xz"; - sha256 = "1a7nsi28q57ic99hrb6x83qlvpqvzvk6acbfl6ncny2j4yaxa4jl"; + tsl = fetchurl { + url = "https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl-mp.xml"; + sha256 = "0llr2fj8vd097hcr1d0xmzdy4jydv0b5j5qlksbjffs22rqgal14"; }; - patches = [ ./certs.patch ./glibc-2_26.patch ]; + nativeBuildInputs = [ cmake darkhttpd gettext makeWrapper pkgconfig ]; - unpackPhase = '' - mkdir src - tar xf $src -C src - cd src + postPatch = '' + substituteInPlace client/CMakeLists.txt \ + --replace $\{TSL_URL} file://${tsl} ''; + patches = [ + # https://github.com/open-eid/qdigidoc/pull/163 + ./qt511.patch + ]; + + buildInputs = [ + libdigidocpp + opensc + openldap + openssl + pcsclite + qtbase + qttranslations + ]; + postInstall = '' wrapProgram $out/bin/qdigidocclient \ --prefix LD_LIBRARY_PATH : ${opensc}/lib/pkcs11/ ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake ccid qttools pcsclite qttranslations - hicolor-icon-theme libdigidocpp opensc shared-mime-info - openldap gettext desktop-file-utils makeWrapper - ]; - - enableParallelBuilding = true; - meta = with stdenv.lib; { - description = "Qt based UI application for verifying and signing digital signatures"; - homepage = http://www.id.ee/; - license = licenses.lgpl2; + description = "Qt-based UI for signing and verifying DigiDoc documents"; + homepage = https://www.id.ee/; + license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = [ maintainers.jagajaga ]; + maintainers = with maintainers; [ yegortimoshenko ]; }; } diff --git a/pkgs/tools/security/qdigidoc/glibc-2_26.patch b/pkgs/tools/security/qdigidoc/glibc-2_26.patch deleted file mode 100644 index 1d99538e72d97..0000000000000 --- a/pkgs/tools/security/qdigidoc/glibc-2_26.patch +++ /dev/null @@ -1,221 +0,0 @@ -diff --git a/common/google-breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc b/common/google-breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc -index b20a68b..38f1375 100644 ---- a/common/google-breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc -+++ b/common/google-breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc -@@ -36,19 +36,19 @@ namespace google_breakpad { - - // Minidump defines register structures which are different from the raw - // structures which we get from the kernel. These are platform specific --// functions to juggle the ucontext and user structures into minidump format. -+// functions to juggle the ucontext_t and user structures into minidump format. - - #if defined(__i386__) - --uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { - return uc->uc_mcontext.gregs[REG_ESP]; - } - --uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { - return uc->uc_mcontext.gregs[REG_EIP]; - } - --void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, -+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, - const struct _libc_fpstate* fp) { - const greg_t* regs = uc->uc_mcontext.gregs; - -@@ -88,15 +88,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, - - #elif defined(__x86_64) - --uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { - return uc->uc_mcontext.gregs[REG_RSP]; - } - --uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { - return uc->uc_mcontext.gregs[REG_RIP]; - } - --void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, -+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, - const struct _libc_fpstate* fpregs) { - const greg_t* regs = uc->uc_mcontext.gregs; - -@@ -145,15 +145,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, - - #elif defined(__ARM_EABI__) - --uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { - return uc->uc_mcontext.arm_sp; - } - --uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { - return uc->uc_mcontext.arm_pc; - } - --void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) { -+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) { - out->context_flags = MD_CONTEXT_ARM_FULL; - - out->iregs[0] = uc->uc_mcontext.arm_r0; -@@ -184,15 +184,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) { - - #elif defined(__aarch64__) - --uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { - return uc->uc_mcontext.sp; - } - --uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { - return uc->uc_mcontext.pc; - } - --void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, -+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, - const struct fpsimd_context* fpregs) { - out->context_flags = MD_CONTEXT_ARM64_FULL; - -@@ -210,15 +210,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, - - #elif defined(__mips__) - --uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { - return uc->uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]; - } - --uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { - return uc->uc_mcontext.pc; - } - --void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) { -+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) { - out->context_flags = MD_CONTEXT_MIPS_FULL; - - for (int i = 0; i < MD_CONTEXT_MIPS_GPR_COUNT; ++i) -diff --git a/common/google-breakpad/src/client/linux/dump_writer_common/ucontext_reader.h b/common/google-breakpad/src/client/linux/dump_writer_common/ucontext_reader.h -index b6e77b4..2de80b7 100644 ---- a/common/google-breakpad/src/client/linux/dump_writer_common/ucontext_reader.h -+++ b/common/google-breakpad/src/client/linux/dump_writer_common/ucontext_reader.h -@@ -39,23 +39,23 @@ - - namespace google_breakpad { - --// Wraps platform-dependent implementations of accessors to ucontext structs. -+// Wraps platform-dependent implementations of accessors to ucontext_t structs. - struct UContextReader { -- static uintptr_t GetStackPointer(const struct ucontext* uc); -+ static uintptr_t GetStackPointer(const ucontext_t* uc); - -- static uintptr_t GetInstructionPointer(const struct ucontext* uc); -+ static uintptr_t GetInstructionPointer(const ucontext_t* uc); - -- // Juggle a arch-specific ucontext into a minidump format -+ // Juggle a arch-specific ucontext_t into a minidump format - // out: the minidump structure - // info: the collection of register structures. - #if defined(__i386__) || defined(__x86_64) -- static void FillCPUContext(RawContextCPU *out, const ucontext *uc, -+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc, - const struct _libc_fpstate* fp); - #elif defined(__aarch64__) -- static void FillCPUContext(RawContextCPU *out, const ucontext *uc, -+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc, - const struct fpsimd_context* fpregs); - #else -- static void FillCPUContext(RawContextCPU *out, const ucontext *uc); -+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc); - #endif - }; - -diff --git a/common/google-breakpad/src/client/linux/handler/exception_handler.cc b/common/google-breakpad/src/client/linux/handler/exception_handler.cc -index 3e2d196..b6d02ef 100644 ---- a/common/google-breakpad/src/client/linux/handler/exception_handler.cc -+++ b/common/google-breakpad/src/client/linux/handler/exception_handler.cc -@@ -404,9 +404,9 @@ bool ExceptionHandler::HandleSignal(int sig, siginfo_t* info, void* uc) { - // Fill in all the holes in the struct to make Valgrind happy. - memset(&context, 0, sizeof(context)); - memcpy(&context.siginfo, info, sizeof(siginfo_t)); -- memcpy(&context.context, uc, sizeof(struct ucontext)); -+ memcpy(&context.context, uc, sizeof(ucontext_t)); - #if defined(__aarch64__) -- struct ucontext *uc_ptr = (struct ucontext*)uc; -+ ucontext_t* uc_ptr = (ucontext_t*)uc; - struct fpsimd_context *fp_ptr = - (struct fpsimd_context*)&uc_ptr->uc_mcontext.__reserved; - if (fp_ptr->head.magic == FPSIMD_MAGIC) { -@@ -414,9 +414,9 @@ bool ExceptionHandler::HandleSignal(int sig, siginfo_t* info, void* uc) { - } - #elif !defined(__ARM_EABI__) && !defined(__mips__) - // FP state is not part of user ABI on ARM Linux. -- // In case of MIPS Linux FP state is already part of struct ucontext -+ // In case of MIPS Linux FP state is already part of ucontext_t - // and 'float_state' is not a member of CrashContext. -- struct ucontext *uc_ptr = (struct ucontext*)uc; -+ ucontext_t* uc_ptr = (ucontext_t*)uc; - if (uc_ptr->uc_mcontext.fpregs) { - memcpy(&context.float_state, - uc_ptr->uc_mcontext.fpregs, -@@ -440,7 +440,7 @@ bool ExceptionHandler::SimulateSignalDelivery(int sig) { - // ExceptionHandler::HandleSignal(). - siginfo.si_code = SI_USER; - siginfo.si_pid = getpid(); -- struct ucontext context; -+ ucontext_t context; - getcontext(&context); - return HandleSignal(sig, &siginfo, &context); - } -diff --git a/common/google-breakpad/src/client/linux/handler/exception_handler.h b/common/google-breakpad/src/client/linux/handler/exception_handler.h -index 591c310..42f4055 100644 ---- a/common/google-breakpad/src/client/linux/handler/exception_handler.h -+++ b/common/google-breakpad/src/client/linux/handler/exception_handler.h -@@ -191,11 +191,11 @@ class ExceptionHandler { - struct CrashContext { - siginfo_t siginfo; - pid_t tid; // the crashing thread. -- struct ucontext context; -+ ucontext_t context; - #if !defined(__ARM_EABI__) && !defined(__mips__) - // #ifdef this out because FP state is not part of user ABI for Linux ARM. -- // In case of MIPS Linux FP state is already part of struct -- // ucontext so 'float_state' is not required. -+ // In case of MIPS Linux FP state is already part of ucontext_t so -+ // 'float_state' is not required. - fpstate_t float_state; - #endif - }; -diff --git a/common/google-breakpad/src/client/linux/microdump_writer/microdump_writer.cc b/common/google-breakpad/src/client/linux/microdump_writer/microdump_writer.cc -index 494e2a2..c00436b 100644 ---- a/common/google-breakpad/src/client/linux/microdump_writer/microdump_writer.cc -+++ b/common/google-breakpad/src/client/linux/microdump_writer/microdump_writer.cc -@@ -328,7 +328,7 @@ class MicrodumpWriter { - - void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); } - -- const struct ucontext* const ucontext_; -+ const ucontext_t* const ucontext_; - #if !defined(__ARM_EABI__) && !defined(__mips__) - const google_breakpad::fpstate_t* const float_state_; - #endif -diff --git a/common/google-breakpad/src/client/linux/minidump_writer/minidump_writer.cc b/common/google-breakpad/src/client/linux/minidump_writer/minidump_writer.cc -index 8406ffe..7e6fe52 100644 ---- a/common/google-breakpad/src/client/linux/minidump_writer/minidump_writer.cc -+++ b/common/google-breakpad/src/client/linux/minidump_writer/minidump_writer.cc -@@ -1221,7 +1221,7 @@ class MinidumpWriter { - const int fd_; // File descriptor where the minidum should be written. - const char* path_; // Path to the file where the minidum should be written. - -- const struct ucontext* const ucontext_; // also from the signal handler -+ const ucontext_t* const ucontext_; // also from the signal handler - #if !defined(__ARM_EABI__) && !defined(__mips__) - const google_breakpad::fpstate_t* const float_state_; // ditto - #endif diff --git a/pkgs/tools/security/qdigidoc/qt511.patch b/pkgs/tools/security/qdigidoc/qt511.patch new file mode 100644 index 0000000000000..1300422d353e9 --- /dev/null +++ b/pkgs/tools/security/qdigidoc/qt511.patch @@ -0,0 +1,62 @@ +diff --git a/client/Application.cpp b/client/Application.cpp +index fce9eee..cec84ae 100644 +--- a/client/Application.cpp ++++ b/client/Application.cpp +@@ -54,6 +54,7 @@ + #include <QtGui/QFileOpenEvent> + #include <QtNetwork/QNetworkProxy> + #include <QtNetwork/QSslConfiguration> ++#include <QtWidgets/QAction> + #include <QtWidgets/QMessageBox> + #include <QtWidgets/QProgressBar> + #include <QtWidgets/QProgressDialog> +diff --git a/client/MainWindow.cpp b/client/MainWindow.cpp +index 06d561e..b4aa0d5 100644 +--- a/client/MainWindow.cpp ++++ b/client/MainWindow.cpp +@@ -44,6 +44,8 @@ + #include <QtPrintSupport/QPrinter> + #include <QtPrintSupport/QPrinterInfo> + #include <QtPrintSupport/QPrintPreviewDialog> ++#include <QtWidgets/QActionGroup> ++#include <QtWidgets/QButtonGroup> + #include <QtWidgets/QCompleter> + #include <QtWidgets/QMessageBox> + +diff --git a/client/MainWindow.h b/client/MainWindow.h +index b9515dd..661418a 100644 +--- a/client/MainWindow.h ++++ b/client/MainWindow.h +@@ -24,6 +24,7 @@ + #include <QtCore/QStringList> + + class DigiDoc; ++class QActionGroup; + class QPrinter; + + class MainWindow: public QWidget, private Ui::MainWindow +diff --git a/crypto/MainWindow.cpp b/crypto/MainWindow.cpp +index c3d3115..f12d984 100644 +--- a/crypto/MainWindow.cpp ++++ b/crypto/MainWindow.cpp +@@ -35,6 +35,8 @@ + #include <QtGui/QDesktopServices> + #include <QtGui/QDragEnterEvent> + #include <QtNetwork/QSslKey> ++#include <QtWidgets/QActionGroup> ++#include <QtWidgets/QButtonGroup> + #include <QtWidgets/QMessageBox> + #include <QtWidgets/QProgressBar> + #include <QtWidgets/QProgressDialog> +diff --git a/crypto/MainWindow.h b/crypto/MainWindow.h +index 16dbec4..01ec99f 100644 +--- a/crypto/MainWindow.h ++++ b/crypto/MainWindow.h +@@ -21,6 +21,7 @@ + + #include "ui_MainWindow.h" + ++class QActionGroup; + class CKey; + class CryptoDoc; + diff --git a/pkgs/tools/security/sbsigntool/default.nix b/pkgs/tools/security/sbsigntool/default.nix index bcf1a5c1f7926..cfe54967cce36 100644 --- a/pkgs/tools/security/sbsigntool/default.nix +++ b/pkgs/tools/security/sbsigntool/default.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { homepage = http://jk.ozlabs.org/docs/sbkeysync-maintaing-uefi-key-databases; maintainers = [ maintainers.tstrobel ]; platforms = [ "x86_64-linux" ]; # Broken on i686 + license = licenses.gpl3; }; } diff --git a/pkgs/tools/security/seccure/default.nix b/pkgs/tools/security/seccure/default.nix index 1a276875ed7a6..a2ec48d4d270f 100644 --- a/pkgs/tools/security/seccure/default.nix +++ b/pkgs/tools/security/seccure/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { homepage = http://point-at-infinity.org/seccure/; description = "Zero-configuration elliptic curve cryptography utility"; platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.lgpl3; }; } diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix index c3bf4f69a46d6..ac21097a09f55 100644 --- a/pkgs/tools/security/sshuttle/default.nix +++ b/pkgs/tools/security/sshuttle/default.nix @@ -45,6 +45,7 @@ python3Packages.buildPythonApplication rec { target network (though it does require Python 2 at both ends). Works with Linux and Mac OS and supports DNS tunneling. ''; + license = licenses.gpl2; maintainers = with maintainers; [ domenkozar ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/security/ssss/default.nix b/pkgs/tools/security/ssss/default.nix index b286f31304e9f..3bbcdafcdcdd5 100644 --- a/pkgs/tools/security/ssss/default.nix +++ b/pkgs/tools/security/ssss/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { description = "Shamir Secret Sharing Scheme"; homepage = http://point-at-infinity.org/ssss/; platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 2c422d5160461..a9e8d8fca3516 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -9,28 +9,26 @@ let }; in stdenv.mkDerivation rec { name = "vault-${version}"; - version = "0.10.3"; + version = "0.10.4"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "16sndzbfciw4bccxm7sc83y2pma2bgsmc1kqyb2hp0jsdy4rl3k4"; + sha256 = "1f11arvj7zp8wwkvv3nn7kyga0ci8psdif6djrnzwjksskdgdbx5"; }; nativeBuildInputs = [ go gox removeReferencesTo ]; - buildPhase = '' + preBuild = '' patchShebangs ./ substituteInPlace scripts/build.sh --replace 'git rev-parse HEAD' 'echo ${src.rev}' sed -i s/'^GIT_DIRTY=.*'/'GIT_DIRTY="+NixOS"'/ scripts/build.sh - mkdir -p src/github.com/hashicorp + mkdir -p .git/hooks src/github.com/hashicorp ln -s $(pwd) src/github.com/hashicorp/vault - mkdir -p .git/hooks - - GOPATH=$(pwd) make + export GOPATH=$(pwd) ''; installPhase = '' @@ -47,6 +45,6 @@ in stdenv.mkDerivation rec { description = "A tool for managing secrets"; platforms = platforms.linux ++ platforms.darwin; license = licenses.mpl20; - maintainers = with maintainers; [ rushmorem offline pradeepchhetri ]; + maintainers = with maintainers; [ rushmorem lnl7 offline pradeepchhetri ]; }; } diff --git a/pkgs/tools/system/setserial/default.nix b/pkgs/tools/system/setserial/default.nix index 959334f4cc5d8..d6e8f4f1bb9fb 100644 --- a/pkgs/tools/system/setserial/default.nix +++ b/pkgs/tools/system/setserial/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { meta = { description = "Serial port configuration utility"; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/tools/text/shfmt/default.nix index fe699b3559002..2ab568ba84167 100644 --- a/pkgs/tools/text/shfmt/default.nix +++ b/pkgs/tools/text/shfmt/default.nix @@ -21,5 +21,6 @@ buildGoPackage rec { shfmt formats shell programs. It can use tabs or any number of spaces to indent. You can feed it standard input, any number of files or any number of directories to recurse into. ''; + license = licenses.bsd3; }; } diff --git a/pkgs/tools/typesetting/xmlroff/default.nix b/pkgs/tools/typesetting/xmlroff/default.nix index e6966834feb53..523a34c0b5692 100644 --- a/pkgs/tools/typesetting/xmlroff/default.nix +++ b/pkgs/tools/typesetting/xmlroff/default.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/tools/video/vnc2flv/default.nix b/pkgs/tools/video/vnc2flv/default.nix index 32cf2771b51da..561c8cf7d78f8 100644 --- a/pkgs/tools/video/vnc2flv/default.nix +++ b/pkgs/tools/video/vnc2flv/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, pythonPackages }: +{ stdenv, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { name = "vnc2flv-20100207"; @@ -15,5 +15,6 @@ pythonPackages.buildPythonApplication rec { meta = { description = "Tool to record VNC sessions to Flash Video"; homepage = http://www.unixuser.org/~euske/python/vnc2flv/; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/tools/video/vncrec/default.nix b/pkgs/tools/video/vncrec/default.nix index 162a1b6d5a47a..7efcf6cbf83aa 100644 --- a/pkgs/tools/video/vncrec/default.nix +++ b/pkgs/tools/video/vncrec/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { description = "VNC recorder"; homepage = http://ronja.twibright.com/utils/vncrec/; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 656f9d15fd03f..2c4fc784ffe07 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -575,6 +575,8 @@ with pkgs; awslogs = callPackage ../tools/admin/awslogs { }; + aws-okta = callPackage ../tools/security/aws-okta { }; + aws-rotate-key = callPackage ../tools/admin/aws-rotate-key { }; aws_shell = pythonPackages.callPackage ../tools/admin/aws_shell { }; @@ -1547,8 +1549,6 @@ with pkgs; apparix = callPackage ../tools/misc/apparix { }; - appdata-tools = callPackage ../tools/misc/appdata-tools { }; - appleseed = callPackage ../tools/graphics/appleseed { }; arping = callPackage ../tools/networking/arping { }; @@ -4128,21 +4128,21 @@ with pkgs; networkmanager = callPackage ../tools/networking/network-manager { }; - networkmanager-iodine = callPackage ../tools/networking/network-manager/iodine.nix { }; + networkmanager-iodine = callPackage ../tools/networking/network-manager/iodine { }; networkmanager-openvpn = callPackage ../tools/networking/network-manager/openvpn { }; - networkmanager-l2tp = callPackage ../tools/networking/network-manager/l2tp.nix { }; + networkmanager-l2tp = callPackage ../tools/networking/network-manager/l2tp { }; - networkmanager-vpnc = callPackage ../tools/networking/network-manager/vpnc.nix { }; + networkmanager-vpnc = callPackage ../tools/networking/network-manager/vpnc { }; - networkmanager-openconnect = callPackage ../tools/networking/network-manager/openconnect.nix { }; + networkmanager-openconnect = callPackage ../tools/networking/network-manager/openconnect { }; - networkmanager-fortisslvpn = callPackage ../tools/networking/network-manager/fortisslvpn.nix { }; + networkmanager-fortisslvpn = callPackage ../tools/networking/network-manager/fortisslvpn { }; networkmanager_strongswan = callPackage ../tools/networking/network-manager/strongswan.nix { }; - networkmanagerapplet = newScope gnome2 ../tools/networking/network-manager/applet.nix { }; + networkmanagerapplet = callPackage ../tools/networking/network-manager/applet.nix { }; networkmanager_dmenu = callPackage ../tools/networking/network-manager/dmenu.nix { }; @@ -5029,7 +5029,7 @@ with pkgs; sasview = callPackage ../applications/science/misc/sasview {}; - scallion = callPackage ../tools/security/scallion { mono = mono4; }; + scallion = callPackage ../tools/security/scallion { }; scanbd = callPackage ../tools/graphics/scanbd { }; @@ -5553,6 +5553,8 @@ with pkgs; trickle = callPackage ../tools/networking/trickle {}; + inherit (nodePackages) triton; + triggerhappy = callPackage ../tools/inputmethods/triggerhappy {}; trousers = callPackage ../tools/security/trousers { }; @@ -5939,7 +5941,7 @@ with pkgs; volumeicon = callPackage ../tools/audio/volumeicon { }; - waf = callPackage ../development/tools/build-managers/waf { }; + waf = callPackage ../development/tools/build-managers/waf { python = python3; }; wakelan = callPackage ../tools/networking/wakelan { }; @@ -6344,10 +6346,10 @@ with pkgs; fpc = callPackage ../development/compilers/fpc { }; - gambit = callPackage ../development/compilers/gambit { }; - gambit-unstable = callPackage ../development/compilers/gambit/unstable.nix { }; - gerbil = callPackage ../development/compilers/gerbil { }; - gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { }; + gambit = callPackage ../development/compilers/gambit { stdenv = gccStdenv; }; + gambit-unstable = callPackage ../development/compilers/gambit/unstable.nix { stdenv = gccStdenv; }; + gerbil = callPackage ../development/compilers/gerbil { stdenv = gccStdenv; }; + gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { stdenv = gccStdenv; }; gccFun = callPackage ../development/compilers/gcc/7; gcc = gcc7; @@ -6444,14 +6446,6 @@ with pkgs; libc = libcCross1; }; - # Only needed for mingw builds - gccCrossMingw2 = assert targetPlatform != buildPlatform; wrapCCWith { - name = "gcc-cross-wrapper"; - cc = gccCrossStageStatic.gcc; - libc = windows.mingw_headers2; - inherit binutils; - }; - gcc48 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.8 { inherit noSysDirs; @@ -7016,6 +7010,8 @@ with pkgs; monoDLLFixer = callPackage ../build-support/mono-dll-fixer { }; + mosml = callPackage ../development/compilers/mosml { }; + mozart-binary = callPackage ../development/compilers/mozart/binary.nix { }; mozart = mozart-binary; @@ -7639,6 +7635,8 @@ with pkgs; ruby = ruby_2_4; + mruby = callPackage ../development/compilers/mruby { }; + scsh = callPackage ../development/interpreters/scsh { }; scheme48 = callPackage ../development/interpreters/scheme48 { }; @@ -7751,6 +7749,8 @@ with pkgs; guile = guile_2_0; }; + inav = callPackage ../development/misc/stm32/inav { }; + pharo-vms = callPackage ../development/pharo/vm { }; pharo = pharo-vms.multi-vm-wrapper; pharo-cog32 = pharo-vms.cog32; @@ -7853,6 +7853,7 @@ with pkgs; bazel_0_4 = callPackage ../development/tools/build-managers/bazel/0.4.nix { }; bazel = callPackage ../development/tools/build-managers/bazel { + inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; }; @@ -8316,6 +8317,8 @@ with pkgs; kube-aws = callPackage ../development/tools/kube-aws { }; + kubectx = callPackage ../development/tools/kubectx { }; + kustomize = callPackage ../development/tools/kustomize { }; Literate = callPackage ../development/tools/literate-programming/Literate {}; @@ -10370,6 +10373,8 @@ with pkgs; libindicator-gtk3 = libindicator.override { gtkVersion = "3"; }; libindicator = callPackage ../development/libraries/libindicator { }; + libinotify-kqueue = callPackage ../development/libraries/libinotify-kqueue { }; + libiodbc = callPackage ../development/libraries/libiodbc { useGTK = config.libiodbc.gtk or false; }; @@ -10509,9 +10514,7 @@ with pkgs; libiec61883 = callPackage ../development/libraries/libiec61883 { }; - libinfinity = callPackage ../development/libraries/libinfinity { - inherit (gnome2) gtkdoc; - }; + libinfinity = callPackage ../development/libraries/libinfinity { }; libinput = callPackage ../development/libraries/libinput { graphviz = graphviz-nox; @@ -13874,6 +13877,16 @@ with pkgs; ]; }; + linux_4_18 = callPackage ../os-specific/linux/kernel/linux-4.18.nix { + kernelPatches = + [ kernelPatches.bridge_stp_helper + # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md + # when adding a new linux version + # kernelPatches.cpu-cgroup-v2."4.11" + kernelPatches.modinst_arg_list_too_long + ]; + }; + linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -14067,7 +14080,7 @@ with pkgs; linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = linuxPackages_4_17; + linuxPackages_latest = linuxPackages_4_18; linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. @@ -14078,6 +14091,7 @@ with pkgs; linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14); linuxPackages_4_17 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_17); + linuxPackages_4_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_18); # Don't forget to update linuxPackages_latest! # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds. @@ -14582,50 +14596,7 @@ with pkgs; vndr = callPackage ../development/tools/vndr { }; - windows = rec { - cygwinSetup = callPackage ../os-specific/windows/cygwin-setup { }; - - jom = callPackage ../os-specific/windows/jom { }; - - w32api = callPackage ../os-specific/windows/w32api { }; - - w32api_headers = callPackage ../os-specific/windows/w32api/headers { }; - - mingw_runtime = callPackage ../os-specific/windows/mingwrt { }; - - mingw_runtime_headers = callPackage ../os-specific/windows/mingwrt/headers.nix { }; - - mingw_headers1 = buildEnv { - name = "mingw-headers-1"; - paths = [ w32api_headers mingw_runtime_headers ]; - }; - - mingw_headers2 = buildEnv { - name = "mingw-headers-2"; - paths = [ w32api mingw_runtime_headers ]; - }; - - mingw_headers3 = buildEnv { - name = "mingw-headers-3"; - paths = [ w32api mingw_runtime ]; - }; - - mingw_w64 = callPackage ../os-specific/windows/mingw-w64 { - stdenv = crossLibcStdenv; - }; - - mingw_w64_headers = callPackage ../os-specific/windows/mingw-w64/headers.nix { }; - - mingw_w64_pthreads = callPackage ../os-specific/windows/mingw-w64/pthreads.nix { }; - - pthreads = callPackage ../os-specific/windows/pthread-w32 { - mingw_headers = mingw_headers3; - }; - - wxMSW = callPackage ../os-specific/windows/wxMSW-2.8 { }; - - libgnurx = callPackage ../os-specific/windows/libgnurx { }; - }; + windows = callPackages ../os-specific/windows {}; wirelesstools = callPackage ../os-specific/linux/wireless-tools { }; @@ -15436,10 +15407,10 @@ with pkgs; (callPackage ../applications/science/electronics/bitscope/packages.nix { }); bitwig-studio1 = callPackage ../applications/audio/bitwig-studio/bitwig-studio1.nix { - inherit (gnome2) zenity; + inherit (gnome3) zenity; }; bitwig-studio2 = callPackage ../applications/audio/bitwig-studio/bitwig-studio2.nix { - inherit (gnome2) zenity; + inherit (gnome3) zenity; inherit (self) bitwig-studio1; }; bitwig-studio = bitwig-studio2; @@ -16568,9 +16539,7 @@ with pkgs; gocr = callPackage ../applications/graphics/gocr { }; - gobby5 = callPackage ../applications/editors/gobby { - inherit (gnome2) gtksourceview; - }; + gobby5 = callPackage ../applications/editors/gobby { }; gphoto2 = callPackage ../applications/misc/gphoto2 { }; @@ -16875,6 +16844,8 @@ with pkgs; inherit (nodePackages) imapnotify; + img2pdf = callPackage ../applications/misc/img2pdf { }; + # Impressive, formerly known as "KeyJNote". impressive = callPackage ../applications/office/impressive { }; @@ -16927,6 +16898,10 @@ with pkgs; jalv = callPackage ../applications/audio/jalv { }; + jameica = callPackage ../applications/office/jameica { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; + jamin = callPackage ../applications/audio/jamin { }; japa = callPackage ../applications/audio/japa { }; @@ -18038,7 +18013,7 @@ with pkgs; qsyncthingtray = libsForQt5.callPackage ../applications/misc/qsyncthingtray { }; - qstopmotion = callPackage ../applications/video/qstopmotion { }; + qstopmotion = libsForQt5.callPackage ../applications/video/qstopmotion { }; qsynth = libsForQt5.callPackage ../applications/audio/qsynth { }; @@ -18515,7 +18490,7 @@ with pkgs; }) subversion18 subversion19 subversion_1_10; - subversion = pkgs.subversion19; + subversion = subversion_1_10; subversionClient = appendToName "client" (pkgs.subversion.override { bdbSupport = false; @@ -19302,25 +19277,19 @@ with pkgs; packages = self: []; }; - xmonad_log_applet_gnome2 = xmonad_log_applet.override { - desktopSupport = "gnome2"; + xmonad_log_applet = callPackage ../applications/window-managers/xmonad/log-applet { + desktopSupport = "gnomeflashback"; inherit (xfce) libxfce4util xfce4-panel; - gnome2_panel = gnome2.gnome_panel; - GConf2 = gnome2.GConf; }; - xmonad_log_applet = callPackage ../applications/window-managers/xmonad/log-applet { - desktopSupport = "gnome3"; + xmonad_log_applet_mate = xmonad_log_applet.override { + desktopSupport = "mate"; inherit (xfce) libxfce4util xfce4-panel; - gnome2_panel = gnome2.gnome_panel; - GConf2 = gnome2.GConf; }; xmonad_log_applet_xfce = xmonad_log_applet.override { desktopSupport = "xfce4"; inherit (xfce) libxfce4util xfce4-panel; - gnome2_panel = gnome2.gnome_panel; - GConf2 = gnome2.GConf; }; xmpp-client = callPackage ../applications/networking/instant-messengers/xmpp-client { }; @@ -19563,7 +19532,7 @@ with pkgs; crafty = callPackage ../games/crafty { }; - crawlTiles = crawl.override { + crawlTiles = callPackage ../games/crawl { tileMode = true; }; @@ -21487,8 +21456,6 @@ with pkgs; nix-top = callPackage ../tools/package-management/nix-top { }; - nix-repl = callPackage ../tools/package-management/nix-repl { nix = nix1; }; - nix-review = callPackage ../tools/package-management/nix-review { }; nix-serve = callPackage ../tools/package-management/nix-serve { }; @@ -21528,7 +21495,7 @@ with pkgs; mnemonicode = callPackage ../misc/mnemonicode { }; - mysql-workbench = newScope gnome2 ../applications/misc/mysql-workbench (let mysql = mysql57; in { + mysql-workbench = callPackage ../applications/misc/mysql-workbench (let mysql = mysql57; in { gdal = gdal.override {mysql = mysql // {lib = {dev = mysql;};};}; mysql = mysql; pcre = pcre-cpp; @@ -21859,7 +21826,7 @@ with pkgs; }); winetricks = callPackage ../misc/emulators/wine/winetricks.nix { - inherit (gnome2) zenity; + inherit (gnome3) zenity; }; with-shell = callPackage ../applications/misc/with-shell { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 46a1324aab5e4..2147ae5040a72 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -230,6 +230,8 @@ in { breathe = callPackage ../development/python-modules/breathe { }; + browser-cookie3 = callPackage ../development/python-modules/browser-cookie3 { }; + browsermob-proxy = disabledIf isPy3k (callPackage ../development/python-modules/browsermob-proxy {}); bugseverywhere = callPackage ../applications/version-management/bugseverywhere {}; @@ -2452,22 +2454,6 @@ in { flit = callPackage ../development/python-modules/flit { }; - Flootty = buildPythonPackage rec { - name = "Flootty-3.2.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/F/Flootty/${name}.tar.gz"; - sha256 = "14n2q2k388xbmp5rda5ss879bg5cbibk4zzz7c8mrjsmxhgagmmg"; - }; - - meta = with pkgs.stdenv.lib; { - description = "Floobits collaborative terminal"; - homepage = "https://github.com/Floobits/flootty/"; - maintainers = with maintainers; [ garbas ]; - license = licenses.asl20; - }; - }; - flowlogs_reader = buildPythonPackage rec { name = "flowlogs_reader-1.0.0"; @@ -11005,10 +10991,12 @@ in { python-language-server = callPackage ../development/python-modules/python-language-server {}; - pyls-mypy = callPackage ../development/python-modules/pyls-mypy {}; + pyls-black = callPackage ../development/python-modules/pyls-black {}; pyls-isort = callPackage ../development/python-modules/pyls-isort {}; + pyls-mypy = callPackage ../development/python-modules/pyls-mypy {}; + pyudev = callPackage ../development/python-modules/pyudev { inherit (pkgs) systemd; }; |