1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-20 12:59:25 +00:00
Commit graph

2912 commits

Author SHA1 Message Date
rnhmjoj 6c08b145ab mitmproxy: 1.0.2 -> 2.0.6 2017-03-04 12:58:29 +02:00
Joachim Schiele d6b0c87bda tlspool: init at 20170123 (#23437) 2017-03-03 17:38:33 +01:00
Pradeep Chhetri 6c99a31c89 httplab: init at 0.1.0 2017-03-03 17:35:31 +01:00
Jörg Thalheim 53b059ade5
miniupnpc: switch to old version by default
miniupnpc 2.0.20161216 change its api
2017-03-02 19:30:37 +01:00
Renaud b0ae3c14fb httping 2.5: fetch over https + license 2017-03-02 19:20:26 +01:00
Jörg Thalheim 4103fa5257 Merge pull request #23371 from ndowens/hans
hans: 0.4.4 -> 1.0
2017-03-02 11:43:52 +01:00
Domen Kožar 4064889e96 Merge pull request #23377 from ndowens/connect
connect: 1.104 -> 1.105
2017-03-02 11:36:04 +01:00
Jörg Thalheim 0e07b7b6be Merge pull request #23369 from ndowens/httping
httping: 2.4 -> 2.5
2017-03-02 11:27:11 +01:00
Jörg Thalheim e867620d02 Merge pull request #23367 from ndowens/miniupnpc
miniupnpc: 1.9.20150430 -> 2.0.20161216
2017-03-02 11:20:48 +01:00
ndowens 9addeafe1a par2cmdline: 0.6.11 -> 0.6.13 (#23361)
* par2cmdline: 0.6.11 -> 0.6.13

* par2cmdline: add autoreconfHook to nativeBuildInputs
2017-03-02 11:02:08 +01:00
Jörg Thalheim a9c0b0a754 Merge pull request #23356 from ndowens/speedtest-cli
speedtest-cli: 0.3.4 -> 1.0.2
2017-03-02 10:52:15 +01:00
ndowens 021046a72e swaks:20130209.0 -> 20170101.0 2017-03-02 08:19:41 +01:00
ndowens d072ac28f8 quicktun: 2.2.4 -> 2.2.5 2017-03-02 08:19:25 +01:00
ndowens ad25011ba1 connect: 1.104 -> 1.105 2017-03-01 20:09:46 -06:00
ndowens 2ff72c684d hans: 0.4.4 -> 1.0 2017-03-01 19:18:29 -06:00
ndowens 5f76147fa7 horst: git-2016-03-15 -> 5.0 2017-03-01 19:16:03 -06:00
ndowens ef4775c2a7 httping: 2.4 -> 2.5 2017-03-01 19:12:00 -06:00
ndowens 9d30abf7b2 miniupnpc: 1.9.20150430 -> 2.0.20161216 2017-03-01 18:43:26 -06:00
ndowens 4313c44de3 pcapc: 2015-03.06 -> 1.0.0 2017-03-01 18:01:42 -06:00
ndowens a55e8605ba pptp: 1.8.0 -> 1.9.0 2017-03-01 17:06:22 -06:00
ndowens 32cf5c4d02 speedtest-cli: 0.3.4 -> 1.0.2 2017-03-01 16:53:30 -06:00
ndowens a911240518 sstp: 1.0.10 -> 1.0.11 2017-03-01 16:48:07 -06:00
Vladimír Čunát b43614a6bb
Merge branch 'staging'
(Truly, this time :-)
2017-03-01 11:34:44 +01:00
Nikolay Amiantov 8aa73bbf55 networkmanagerapplet: add librsvg
Fix tray icon. Also use wrapGAppsHook instead of custom wrapper.
2017-03-01 02:21:35 +03:00
Vladimír Čunát 5c89ab7cb6
unbound: only use the two-phase build on Linux
Hydra shows some problems on Darwin with structure defns/decls.
http://hydra.nixos.org/build/49463873/nixlog/1/raw
2017-02-28 22:32:20 +01:00
Willi Butz b13378c479 openconnect_openssl: added missing dependecy gmp 2017-02-28 17:57:21 +01:00
Lluís Batlle i Rossell 40b9506139
megatools: 1.9.97 -> 1.9.98
Signed-off-by: Lluís Batlle i Rossell <viric@viric.name>
2017-02-27 22:42:49 +01:00
Vladimír Čunát a1919db7cd
Merge branch 'master' into staging 2017-02-27 20:15:27 +01:00
Vladimír Čunát d00c26a595
unbound: lighten direct security deps of libunbound
Unfortunately, it seems easiest to build all twice.
Debian testing does this in a very similar way.

Tested briefly some individual queries and resperf :-)
2017-02-27 18:23:20 +01:00
Lancelot SIX aadc5abb6e
httpie: 0.9.8 -> 0.9.9 2017-02-27 12:41:51 +01:00
Bjørn Forsman 3d104ab2b3 gst-plugins-base: align attrname with pkgname 2017-02-27 12:16:26 +01:00
Bjørn Forsman 0591cd607b gst-plugins-good: align attrname with pkgname 2017-02-27 12:16:26 +01:00
Tristan Helmich b508c1b792 nzbget: 17.1 -> 18.0 2017-02-26 13:36:36 +01:00
Eric Sagnes b4d8eddf48 linkchecker: fix darwin build 2017-02-26 12:30:14 +01:00
Jörg Thalheim 7f5cfd3ec5
samplicator: 1.3.7-beta6 -> 1.3.8rc1 2017-02-26 10:05:18 +01:00
Thomas Tuegel 0ed156a216 Merge pull request #22977 from ttuegel/triage-kde4
Remove KDE 4 desktop packages
2017-02-25 12:21:44 -06:00
Tim Steinbach 6988d2d456
curl: 7.53.0 -> 7.53.1 2017-02-25 09:03:22 -05:00
Thomas Tuegel 9be791656f
Remove kde4.plasma-nm and its dependencies
- Already updated to KDE 5 in Nixpkgs
- Not useful without the KDE 4 desktop
2017-02-24 16:49:01 -06:00
Franz Pletz 114ae6baab
unbound: 1.6.0 -> 1.6.1 2017-02-24 17:57:41 +01:00
Vladimír Čunát 0bfbd039f9
dnsperf: init at 2.1.0.0 2017-02-23 14:03:49 +01:00
Vladimír Čunát ebf782829a
Merge #23063: curl: 7.52.1 -> 7.53.0 2017-02-22 18:11:05 +01:00
Tim Steinbach b1c6a9bfcc
curl: 7.52.1 -> 7.53.0 2017-02-21 18:47:33 -05:00
Vladimír Čunát 3d04d470cd
cjdns: fix build with glibc-2.25 via upstream patch 2017-02-21 13:30:50 +01:00
Pradeep Chhetri 07b301529c wuzz: 0.1.0 -> 0.2.0 (#23002) 2017-02-19 19:11:00 +00:00
Marius Bergmann 7bcb58ad71 keepalived: 1.3.2 -> 1.3.4 2017-02-19 19:50:21 +01:00
Frederik Rietdijk 8c3480f3b9 Merge pull request #22828 from matthiasbeyer/update-my-pkgs
Updates for some of my packages
2017-02-18 14:09:51 +01:00
Vladimír Čunát 432dba859e
Merge branch 'staging'
A security update of libxml2 is within.
2017-02-18 08:59:29 +01:00
Armijn Hemel d950e8c084
fping: 3.15 -> 3.16 2017-02-17 23:44:48 +01:00
Robin Gloster a6eb4669b1 Merge pull request #22872 from ttuegel/isync
Update isync-git, with several other improvements
2017-02-17 02:47:23 +01:00
Pradeep Chhetri 0ea76ef831 wuzz: 2017-02-09 -> 0.1.0 2017-02-17 02:36:14 +01:00
Robin Gloster 900cc90fbe
openfortivpn: 1.1.4 -> 1.2.0 2017-02-17 00:11:55 +01:00
Robin Gloster f6778c8137
aircrack-ng: 1.2-rc3 -> 1.2-rc4 2017-02-17 00:11:32 +01:00
Robin Gloster 108c6d1a03
socat: 1.7.3.1 -> 1.7.3.2
fixes compatibility with openssl 1.1.0 (and libressl)
2017-02-17 00:11:03 +01:00
Joachim F 32befcb62b Merge pull request #22754 from mbrgm/update-keepalived
keepalived: 1.2.19 -> 1.3.2
2017-02-16 23:08:22 +01:00
Thomas Tuegel 953a1e76a2
isyncUnstable: add ttuegel to maintainers 2017-02-16 09:50:31 -06:00
Thomas Tuegel 3994004a6f
isyncUnstable: build with zlib support 2017-02-16 09:50:18 -06:00
Thomas Tuegel 88fec3005b
isyncUnstable: 2015-11-08 -> 20161218
The extra dashes are removed from the version number because Nix treats only the
first component as the version, i.e. `2015-11-08` is version `2015` with two
tags `-11` and `-08`.
2017-02-16 09:48:45 -06:00
Thomas Tuegel 2143043146
isyncUnstable: download over https 2017-02-16 09:48:26 -06:00
Jascha Geerds 900fc49013 Merge pull request #22775 from peterhoeg/u/qtox
tox clients and libraries updates
2017-02-15 23:05:14 +01:00
Matthias Beyer 83d09a3336 http-prompt: 0.8.0 -> 0.9.1 2017-02-15 13:45:58 +01:00
Marius Bergmann 4ebfc19335 keepalived: 1.2.19 -> 1.3.2 2017-02-15 13:05:16 +01:00
Thomas Tuegel ce859290e9
offlineimap: install man pages 2017-02-14 12:37:35 -06:00
Cillian de Roiste 868d30f975 openconnect: add support for stoken
Tested with a Juniper Network Connect VPN
2017-02-14 09:29:57 +01:00
Peter Hoeg 7690ec0022 toxvpn: 20160909 -> 20161230 2017-02-14 14:59:59 +08:00
Franz Pletz e9a5ec099e
wget: 1.19 -> 1.19.1
Fixes build on darwin.

Fixes #22595.
2017-02-12 02:52:25 +01:00
Vladimír Čunát 66fe4af226
Merge recent staging
It's the version last built on Hydra, almost fully.
2017-02-10 18:07:14 +01:00
Joachim F ca8fb930b1 Merge pull request #22356 from Ekleog/redsocks
Redsocks
2017-02-09 22:39:43 +01:00
Pradeep Chhetri 72af039a4d wuzz: 2017-02-05 -> 2017-02-09 2017-02-09 14:36:20 +01:00
Vladimír Čunát 6bea415b5e
Merge branch 'master' into staging 2017-02-09 08:42:04 +01:00
Rok Garbas 725c179be3
networkmanager_strongswan: 1.4.0 -> 1.4.1 2017-02-07 16:12:27 +01:00
Rok Garbas b900796d0f
networkmanager_openvpn: 1.2.6 -> 1.2.8 2017-02-07 16:12:27 +01:00
Rok Garbas 0a687c3d10
networkmanager_openconnect: 1.2.2 -> 1.2.4 2017-02-07 16:12:27 +01:00
Rok Garbas afa428b8f3
networkmanager(applet): 1.4.2 -> 1.4.4 2017-02-07 16:12:10 +01:00
Joachim F 6eb6130e15 Merge pull request #22495 from pradeepchhetri/wuzz-20170205
wuzz: init at 2017-02-05
2017-02-06 15:45:56 +01:00
Pradeep Chhetri f22a7f0558 wuzz: init at 2017-02-05 2017-02-06 19:28:40 +05:30
Franz Pletz 900326fdc0
wget: add some more dependencies & small cleanups
cc #22416
2017-02-06 13:18:33 +01:00
Franz Pletz 8b9e2010b4
libidn2: init at 0.16
wget now needs libidn2 instead of libidn.

cc #22416
2017-02-06 13:18:20 +01:00
Vladimír Čunát 94c73dab1d
Merge #22416: wget: 1.18 -> 1.19 2017-02-05 15:51:24 +01:00
Lengyel Balázs 372cb3760e
Merge #17694: curl: add gnutlsSupport ? false
(incl. a nitpick change from vcunat)
2017-02-05 13:37:16 +01:00
Léo Gaspard 68a609b059
redsocks: init at 0.5 2017-02-05 01:20:03 +01:00
Lancelot SIX 77b72ae355
wget: 1.18 -> 1.19
See http://lists.gnu.org/archive/html/info-gnu/2017-02/msg00000.html
for release announcement.
2017-02-03 18:41:57 +01:00
Robin Gloster 0e0f0d0478
radvd: 2.15 -> 2.16 2017-02-02 19:33:21 +01:00
Robin Gloster 1393d7158a
whois: 5.2.12 -> 5.2.14 2017-02-02 19:19:28 +01:00
Robin Gloster 944403a3fd
babeld: 1.7.1 -> 1.8.0 2017-02-02 19:19:28 +01:00
Robin Gloster 8821ef9dc5
redir: 2.2.1 -> 3.1 2017-02-02 18:59:07 +01:00
Michael Raskin 1561dcdc26 getmail: 4.52.0 -> 4.53.0 2017-02-01 19:28:45 +01:00
Franz Pletz 44cbb0f54d
tcpdump: 4.8.1 -> 4.9.0 for multiple CVEs
Temporarily use the Debian mirros for the sources because upstream hasn't
released the new version. See https://www.debian.org/security/2017/dsa-3775.

Fixes: CVE-2016-7922, CVE-2016-7923, CVE-2016-7924, CVE-2016-7925,
CVE-2016-7926, CVE-2016-7927, CVE-2016-7928, CVE-2016-7929, CVE-2016-7930,
CVE-2016-7931, CVE-2016-7932, CVE-2016-7933, CVE-2016-7934, CVE-2016-7935,
CVE-2016-7936, CVE-2016-7937, CVE-2016-7938, CVE-2016-7939, CVE-2016-7940,
CVE-2016-7973, CVE-2016-7974, CVE-2016-7975, CVE-2016-7983, CVE-2016-7984,
CVE-2016-7985, CVE-2016-7986, CVE-2016-7992, CVE-2016-7993, CVE-2016-8574,
CVE-2016-8575, CVE-2017-5202, CVE-2017-5203, CVE-2017-5204, CVE-2017-5205,
CVE-2017-5341, CVE-2017-5342, CVE-2017-5482, CVE-2017-5483, CVE-2017-5484,
CVE-2017-5485, CVE-2017-5486.
2017-01-31 17:17:12 +01:00
Damien Cassou 58dc8e3024
Remove myself from maintainers 2017-01-31 11:00:14 +01:00
Florian Jacob 97c3ee9525 tinc: 1.0.29 -> 1.0.31 2017-01-30 12:38:02 +01:00
Franz Pletz 083cadee45
offlineimap: 7.0.12 -> 7.0.13 2017-01-30 01:16:22 +01:00
Edward Tjörnhammar 92cb10a253
i2pd: 2.10.0 -> 2.11.0 2017-01-29 17:54:12 +01:00
Tim Steinbach 58dcda6b8c Merge pull request #22235 from aneeshusa/mosh-use-ssh-from-nixpkgs
mosh: use ssh from nixpkgs
2017-01-28 20:06:49 -05:00
Arseniy Seroka d948e55c27 Merge pull request #22240 from pradeepchhetri/openconnect
openconnect: 7.06 -> 7.08
2017-01-29 02:13:14 +03:00
Pradeep Chhetri 56ed9f8b94 openconnect: 7.06 -> 7.08 2017-01-29 02:46:19 +05:30
Lluís Batlle i Rossell 57625514f4 Adding nuttcp. 2017-01-28 20:40:21 +01:00
Aneesh Agrawal ad6b79fc97 mosh: use ssh from nixpkgs 2017-01-28 13:21:24 -05:00
Pradeep Chhetri 04b986cd2d haproxy: 1.6.6 -> 1.7.2 2017-01-26 14:07:51 +05:30
Franz Pletz 6a24c6dc32
stunnel: 5.38 -> 5.39 2017-01-26 03:52:50 +01:00
Franz Pletz ceea7adfbb
aiccu: fix unavailable source url, use debian mirror 2017-01-26 03:52:46 +01:00
Franz Pletz 8f39095abb
biosdevname: 0.6.1 -> 0.7.2 2017-01-26 03:52:45 +01:00
Franz Pletz 1d251e268c
chrony: 2.4.1 -> 3.0, enable seccomp 2017-01-26 03:52:45 +01:00
Franz Pletz 9ac6297b79
ppp: add patch to fix CVE-2015-3310 2017-01-25 20:53:43 -05:00
Michael Raskin 47661c831e Merge pull request #22028 from MostAwesomeDude/tahoe
Tahoe-LAFS version bump
2017-01-24 17:49:00 +00:00
Eelco Dolstra 7bc801e282
curl: Apply upstream patch to fix https hangs
https://github.com/curl/curl/issues/1174

Fixes https://github.com/NixOS/nix/issues/1181.
2017-01-24 13:51:30 +01:00
Corbin c90cab9d8a tahoelafs: 1.11.0 -> 1.12.1 2017-01-23 17:55:14 -08:00
Daiderd Jordan a751959b9f Merge pull request #22075 from romildo/upd.aria2
aria2: 1.29.0 -> 1.31.0
2017-01-24 00:09:25 +01:00
romildo 69bbc78eee aria2: 1.29.0 -> 1.31.0 2017-01-23 19:16:05 -02:00
Joachim F cc3ecce324 Merge pull request #22042 from rnhmjoj/dnscrypt-proxy
dnscrypt-proxy: 1.9.1 -> 1.9.4
2017-01-23 15:53:24 +01:00
rnhmjoj a7b7d0fc3e
dnscrypt-proxy: 1.9.1 -> 1.9.4 2017-01-23 13:15:33 +01:00
Franz Pletz dabedc40a9
ngrep: fix build due to new libpcap, use debian patches 2017-01-22 14:09:50 +01:00
Franz Pletz 9156d932b6
tcpdump: 4.7.4 -> 4.8.1 2017-01-22 13:01:00 +01:00
Vladimír Čunát 6b6553c768
Merge branch 'staging'
It contains security updates.  I somehow forgot to push this yesterday.
2017-01-20 16:33:59 +01:00
Jörg Thalheim 3fdde25b4c Merge pull request #21962 from Mic92/gemdir
bundleEnv: Used gemdir for most applications now
2017-01-19 09:34:14 +01:00
Vladimír Čunát 40003aa2ed
Merge branch 'master' into staging 2017-01-18 15:54:04 +01:00
Jörg Thalheim 246fd4c950
maphosts: use gemdir 2017-01-18 00:52:48 +01:00
Periklis Tsirakidis 513ce19fd0 offlineimap: 7.0.9 -> 7.0.12 2017-01-17 23:04:37 +01:00
Tristan Helmich c7ea194b41 fping: 3.13 -> 3.15 (#21949) 2017-01-17 11:55:09 +01:00
Tristan Helmich c885570944 fping: enable IPv6 (provides fping6 binary) (#21950) 2017-01-17 11:54:03 +01:00
Nikolay Amiantov 70a6628848 Merge pull request #21882 from abbradar/dhcp6
DHCPv6 improvements
2017-01-15 19:53:33 +03:00
Nikolay Amiantov cb418318a0 radvd: 2.13 -> 2.15 2017-01-15 19:38:53 +03:00
Bas van Dijk f0338024b9 strongswan: enable charon-systemd (#21872)
See: https://wiki.strongswan.org/projects/strongswan/wiki/Charon-systemd
2017-01-14 20:41:51 +01:00
Frederik Rietdijk 66d3b9a02d wicd: use python2 2017-01-11 18:25:10 +01:00
Pascal Wittmann 1738be8cd2
axel: 2.11 -> 2.12 2017-01-09 21:32:30 +01:00
Jörg Thalheim 188fcc1eb5
ferm: 2.3 -> 2.3.1 2017-01-08 23:40:40 +01:00
Joachim Fasting 0f24e56728
dnscrypt-proxy: 1.9.0 -> 1.9.1 2017-01-07 08:02:53 +01:00
Vladimír Čunát 07bf828bd9
Merge branch 'staging'; security /cc #21642 2017-01-06 16:32:47 +01:00
Gabriel Ebner b0ccbb395c Merge pull request #21658 from acowley/mu-no-mug
mu: allow gtk-free builds
2017-01-06 00:22:30 -05:00
Anthony Cowley 8ca70e358d mu: allow gtk-free builds
The gtk components are enabled by default when stdenv.isLinux is true.
2017-01-05 17:55:54 -05:00
Franz Pletz e94bfe55c4
mitmproxy: 0.17.1 -> 1.0.2, move to all-packages.nix 2017-01-05 06:25:26 +01:00
Matthias Beyer b5c7ce015f http-prompt: 0.2.0 -> 0.8.0 2017-01-04 16:29:33 +01:00
Daiderd Jordan 27660cfdc0
Merge branch 'master' into staging 2017-01-04 01:42:26 +01:00
Eelco Dolstra 82b0ae1223 Merge pull request #21612 from NeQuissimus/curl_7_52_1
curl: 7.51.0 -> 7.52.1
2017-01-03 16:11:35 +01:00
Tim Steinbach 125fa1520d
curl: 7.51.1 -> 7.52.1 2017-01-03 08:42:59 -05:00
Michael Raskin 277e7119be openvpn: 2.3.13 -> 2.4.0 2017-01-02 15:38:46 +01:00
Michael Raskin 6151982f58 Merge pull request #21581 from bendlas/update-i2p
i2p: 0.9.26 -> 0.9.28
2017-01-02 14:15:10 +00:00
Michael Raskin c882915351 Merge pull request #21548 from FPtje/patch-2
Strongswan: enable rdrand and aes-ni only on X86
2017-01-02 14:07:16 +00:00
Herwig Hochleitner 86a6083498 i2p: 0.9.26 -> 0.9.28
update patch
2017-01-02 13:14:42 +01:00
Daiderd Jordan 5a67b130b9
Merge branch 'master' into staging 2017-01-02 00:54:17 +01:00
Jörg Thalheim d5f8652e6d Merge pull request #17364 from fmu/ndjbdns-fix
ndjbdns: build from latest sources which adds Darwin compatibility
2017-01-01 08:34:28 +01:00
volth 06b372f24f miredo: init at 1.2.6 2016-12-31 21:03:27 +01:00
Falco Peijnenburg 9c61571f1a Strongswan: enable rdrand and aes-ni only on X86
Strongswan fails to compile on armv7l-linux with `--enable-aesni` and  `--enable-rdrand` enabled. Errors are thrown about impossible constraints in asm (`--enable-rdrand`) or about gcc getting unknown command line parameters about aes (`--enable-aesni`). The options only makes sense on X86_64 processors.

The rdrand plugin is designed for Ivy Bridge processors:

> High quality / high performance random source using the Intel rdrand instruction found on Ivy Bridge processors

The aes-ni plugin also only exists on X86 processors (which have the AES instruction set)

Tested with a local override. The change triggers a (successful) rebuild on my X86_64 system. On armv7-linux this change fixes build errors.

See: 
https://wiki.strongswan.org/issues/337
2016-12-31 14:26:17 +01:00
Dhananjay Balan cab497ee6d unbound 1.5.6 > 1.6.0 2016-12-30 18:13:10 +01:00
Joachim Fasting 64f45520b9
dnscrypt-proxy: 1.7.0 -> 1.9.0
Release notes at:
https://github.com/jedisct1/dnscrypt-proxy/releases/tag/1.9.0

Packaging tweaks:
- No longer split man page, kind of pointless ...
- No longer install libtool files, they are now optional
2016-12-30 05:33:58 +01:00
Vladimír Čunát 0163f0c427
openssh: update the gssapi patch
Only building was tested.
2016-12-29 17:04:58 -05:00
Graham Christensen 11e8ed5ff4
Revert "Revert "openssh: security 7.3p1 -> 7.4p1""
This reverts commit 661b5a9875.
2016-12-29 17:04:39 -05:00
Sophie Taylor 0e0fb196ca openntpd: v6+ requires libressl for constraints 2016-12-28 13:35:42 +10:00
zimbatm 12532879b0 zerotierone: 1.1.12 -> 1.1.14 2016-12-27 17:47:41 +00:00
Mitch Tishmack b398665a4e wakelan: refactor allow builds on non linux 2016-12-26 15:04:45 -06:00
Vladimír Čunát 661b5a9875
Revert "openssh: security 7.3p1 -> 7.4p1"
This reverts commit 277080fea0.

I had tested the server on my physical machine before pushing,
but the openssh test got broken so something is clearly wrong.
http://hydra.nixos.org/build/45500080
2016-12-25 22:15:56 +01:00
Vladimír Čunát 277080fea0
openssh: security 7.3p1 -> 7.4p1
The two removed patches were for issues that should've been fixed.
Minor vulnerabilities addressed: CVE-2016-{10009,10010,10011,10012}.
https://www.openssh.com/txt/release-7.4
2016-12-25 18:42:55 +01:00