3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

6664 commits

Author SHA1 Message Date
Vladimír Čunát d88c0cf867
Merge #26628: treewide: setuid/setgid fallout 2017-06-17 13:23:39 +02:00
Jörg Thalheim 878381fd4d rewritefs: add remark to patch 2017-06-17 10:45:35 +01:00
Vladimír Čunát 304391b2f2
Merge branch 'master' into staging
Another couple thousand rebuilds.
2017-06-17 09:58:34 +02:00
Jörg Thalheim c4037ee92b Merge pull request #26583 from mbbx6spp/init-ply-package
ply: init at v1-beta1(9e810b1)
2017-06-16 23:21:23 +01:00
Vladimír Čunát 2a76b6ad69
Merge #26540: utillinux: fix "fstrim --all" 2017-06-16 21:43:26 +02:00
Will Dietz 7270b9b425 rewritefs: Don't attempt to set special bits 2017-06-16 07:22:20 -05:00
Jörg Thalheim f5d98e8e18
ply: fix build 2017-06-15 21:11:35 +01:00
Tim Steinbach b4576c5108
linux: 4.11.4 -> 4.11.5 2017-06-15 08:54:55 -04:00
Tim Steinbach a7efc9f0cd
linux: 4.9.31 -> 4.9.32 2017-06-15 08:53:35 -04:00
Tim Steinbach 07edb44d15
linux: 4.4.71 -> 4.4.72 2017-06-15 08:52:26 -04:00
gnidorah 286c36d737 utillinux: fix "fstrim --all" 2017-06-15 14:05:50 +03:00
Susan Potter fdef885d97
ply: init at v1-beta1(9e810b1) 2017-06-14 17:41:42 -05:00
Charles Strahan 3b1c4fce4f psensor: init at 1.2.0
psensor is a graphical hardware monitoring application for Linux
2017-06-13 18:51:36 -04:00
Will Dietz b83609add3 psmisc: 22.21 -> 23.0
No longer need fuser patch, fixes musl compat.
2017-06-13 22:05:00 +02:00
Jason A. Donenfeld 9d4bf6b155 wireguard: 0.0.20170531 -> 0.0.20170613
Simple version bump. Release notes:

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2017-06-13 15:55:56 +02:00
Vladimír Čunát ed070354a9
Merge branch 'staging' 2017-06-13 11:22:56 +02:00
Jörg Thalheim f866cae200
android-udev-rules: 20170305 -> 20170612 2017-06-13 08:07:04 +01:00
timor d74f8351a5 kernel: enable audio jack reconfiguration
Change kernel config to allow for changing the functions of the audio
jacks at run-time as well as at boot time.
2017-06-13 08:50:34 +03:00
Franz Pletz b733a34e8e
firmwareLinuxNonfree: 2017-03-11 -> 2017-04-16 2017-06-12 17:44:44 +02:00
Franz Pletz c34299f592
dmidecode: 3.0 -> 3.1 2017-06-12 17:44:43 +02:00
Eelco Dolstra 63e9d1c51e
perf: Fix perf annotate
This command requires objdump, so make sure it can find it.
2017-06-12 13:23:18 +02:00
Tim Steinbach 5fbab5dfb3
linux: 4.12-rc4 -> 4.12-rc5 2017-06-11 21:37:46 -04:00
Tuomas Tynkkynen fbea1265d5 audit: 2.6.6 -> 2.7.6 2017-06-11 19:46:09 +03:00
Tuomas Tynkkynen 370ace4cf0 kernel: Don't build self-test modules 2017-06-11 19:33:24 +03:00
Jörg Thalheim fe208a1cc8 Merge pull request #26509 from MP2E/musl_update
musl: 1.1.15 -> 1.1.16
2017-06-11 12:59:17 +01:00
Cray Elliott 6bdebf252c musl: 1.1.15 -> 1.1.16 2017-06-10 15:37:40 -07:00
Vladimír Čunát cb9f953c92
Merge branch 'master' into staging
More larger rebuilds.
2017-06-10 10:07:33 +02:00
Joachim Fasting b1f0af7ef6
linuxPackages.evdi: specify minimum kernel version, per upstream
Upstream says 3.16 is the oldest supported kernel.  No versions prior to
3.18 build on Hydra. See e.g., https://hydra.nixos.org/build/53599831.
2017-06-09 12:54:57 +02:00
Vladimír Čunát 10f9fb63f1
nfs-utils: fixup setuid/setgid build problems, hopefully 2017-06-08 20:43:04 +02:00
Vladimír Čunát ae6df000d0
Merge branch 'master' into staging 2017-06-07 18:11:27 +02:00
Vladimír Čunát 1aac1fe5dd
util-linux: fixup setuid/setgid build problems
... hopefully.  Also refactor some nix code a little.
2017-06-07 15:17:40 +02:00
Vladimír Čunát 833bc78dcf
shadow: fixup setuid/setgid build problems, hopefully 2017-06-07 14:21:04 +02:00
Tim Steinbach c7abd6943e
linux: 4.9.30 -> 4.9.31 2017-06-07 08:09:37 -04:00
Tim Steinbach 01fc1a80b3
linux: 4.4.70 -> 4.4.71 2017-06-07 08:07:53 -04:00
Tim Steinbach 66faa421c9
linux: 4.11.3 -> 4.11.4 2017-06-07 08:05:45 -04:00
Eelco Dolstra 338cdea332
Merge branch 'master2' of https://github.com/gnidorah/nixpkgs into staging 2017-06-07 11:46:17 +02:00
Franz Pletz f0a4e91612
batman-adv: 2017.0 -> 2017.1 2017-06-06 03:58:11 +02:00
Kier Davis b81124b4fb
Fix hooks not being called when overriding phases in various packages
It's necessary to do this in order to fix ckb's compilation, now that
fixupPhase rejects derivation results containing references to the temporary
build directory. It seems like good practice so I've added it to the
other packages that I maintain.
2017-06-05 19:13:19 +01:00
Joachim F 938742fa0b Merge pull request #26403 from vberger/drbd-fix
drbd: Fix incorrect substitution in derivation
2017-06-05 19:02:20 +01:00
Victor Berger 72b9aad4a2 drbd: Fix incorrect substitution in derivation
Prior to this, the build failed as the generated udev rules file
refers to a non-existing file, due to an incorrect substitution.
2017-06-05 16:20:56 +02:00
Tim Steinbach 7c476b98df
linux: 4.12-rc3 -> 4.12-rc4 2017-06-05 10:01:53 -04:00
Peter Hoeg a0598f9b34 tomb: clean up and use gnupg 2 instead of gnupg 1 2017-06-05 18:02:12 +08:00
Jörg Thalheim 2e08839cbe
sysdig: fix unified cgroup handling 2017-06-05 06:13:58 +01:00
Jörg Thalheim 0886c1b321
wireguard: 0.0.20170517 -> 0.0.20170531 2017-06-03 13:23:02 +01:00
Judson Lester bafcdbbb67 bcc: 0.2.0 -> 0.3.0 (#26315) 2017-06-02 22:23:19 +01:00
georgewhewell daf674491e broadcom-sta: add patch for kernel 4.11+ 2017-06-02 14:19:04 +01:00
Frederik Rietdijk 8b5dc2d67b Merge remote-tracking branch 'upstream/master' into HEAD 2017-06-01 10:17:38 +02:00
Nikolay Amiantov 7b41780a0e linuxPackages.nvidia_x11: move patches to specific versions 2017-05-31 16:52:03 +03:00
Nikolay Amiantov 3b4ef34fa0 Merge pull request #26272 from vcunat/p/nvidia-304
nvidia 304 fixes
2017-05-31 16:31:51 +03:00
Vladimír Čunát 0c4b91505e
nvidia_x11_legacy304: apply patches from Debian
The drivers would build but probably wouldn't work without them.
See #26250.
2017-05-31 10:48:54 +02:00
Vladimír Čunát af58f8de55
nvidia_x11_legacy304: 304.134 -> 304.135 2017-05-31 10:02:56 +02:00
Kranium Gikos Mendoza 153e900b39 smemstat: 0.01.16 -> 0.01.17 2017-05-31 01:01:54 +02:00
Kranium Gikos Mendoza 87a800d494 forkstat: 0.01.16 -> 0.01.17 2017-05-31 01:01:54 +02:00
Kranium Gikos Mendoza 2c53d5dea0 fnotifystat: 0.01.16 -> 0.01.17 2017-05-31 01:01:54 +02:00
Kranium Gikos Mendoza b5a3630050 eventstat: 0.03.03 -> 03.03.04 2017-05-31 01:01:54 +02:00
Vladimír Čunát 983657087b
Merge branch 'master' into staging 2017-05-30 19:39:59 +02:00
Vladimír Čunát 538aa0f808
Merge branch 'staging' (early part)
The comparison looks nice on Hydra.
2017-05-30 16:08:21 +02:00
gnidorah a996fe849f fstrim: Add service 2017-05-30 16:39:27 +03:00
Jörg Thalheim dfebb66f65
systemd: v232 -> v233
Changelog: https://github.com/systemd/systemd/blob/v233/NEWS

Upgrade was pretty smooth. One notably change is the new hybrid cgroup
mode: https://github.com/systemd/systemd/blob/v233/NEWS#L5 It should
provide better compatibility with docker.
2017-05-30 08:47:09 +01:00
Tim Steinbach a78af5196c
linux: 4.12-rc2 -> 4.12-rc3 2017-05-29 09:32:52 -04:00
Daiderd Jordan db4ff1d305 Merge pull request #26091 from LnL7/darwin-cf-10.10
CoreFounation: 10.9 -> 10.10
2017-05-28 20:38:16 +02:00
Daiderd Jordan 91caa85804
darwin-Libsystem: include libplatform headers 2017-05-27 23:19:50 +02:00
Daiderd Jordan 815f25f31b
darwin-CF: 855.17 -> 1153.18 2017-05-27 23:19:49 +02:00
Daiderd Jordan bf58495177
darwin-dispatch: 339.92.1 -> 442.1.4 2017-05-27 23:19:48 +02:00
Daiderd Jordan 857648dd31
darwin-libplatform: init at 125 2017-05-27 23:19:47 +02:00
Daiderd Jordan ff1253200b
darwin-ICU: init at 531.48 2017-05-27 23:19:42 +02:00
Armijn Hemel 0786bb00d2 cifs-utils: 6.5 -> 6.6 2017-05-26 20:56:48 +02:00
Vladimír Čunát 00672dec8a
Merge older staging
This still causes some uncached rebuilds, but master(!) and staging
move too fast forward rebuild-wise, so Hydra might never catch up.
(There are also other occasional problems.)
Therefore I merge at this point where the rebuild isn't that bad.
2017-05-26 15:45:43 +02:00
Tim Steinbach 690a83091b
linux: FS_ENCRYPTION only for >= 4.9 kernels 2017-05-25 18:25:08 -04:00
Tim Steinbach 8f0ca4f44a
linux: 4.4.69 -> 4.4.70 2017-05-25 18:21:54 -04:00
Tim Steinbach 446c57fdb2
linux: 4.9.29 -> 4.9.30 2017-05-25 18:19:16 -04:00
Tim Steinbach f618a6caa1
linux: 4.11.2 -> 4.11.3 2017-05-25 18:16:57 -04:00
Joachim Fasting f0c08e3cd4
autofs5: 5.1.2 -> 5.1.3 2017-05-25 23:53:34 +02:00
Eelco Dolstra 8a07319e7f
ixgbevf: 4.0.3 -> 4.1.2
This fixes

  error: assertion failed at /home/eelco/Dev/nixpkgs-stable/pkgs/os-specific/linux/ixgbevf/default.nix:3:1
  (use ‘--show-trace’ to show detailed location information)

deploying a >=4.10 kernel to EC2. (We could probably also drop the
ixgbevf package with recent kernels, since the ixgbevf module included
in the kernel source tree is recent enough according to Amazon's
recommendation.)
2017-05-24 14:51:39 +02:00
Vladimír Čunát 8004e79415
Merge branch 'master' into staging 2017-05-24 03:24:06 +02:00
Robin Gloster f8b0a25983
acpid: 2.0.27 -> 2.0.28 2017-05-23 02:32:39 +02:00
John Ericson 0d88299019 Merge pull request #25976 from obsidiansystems/no-stdenv-is
Add `*Platform.is*` predicates and alias `stdenv.is*` to `hostPlatform`'s
2017-05-22 13:30:20 -04:00
Arseniy Seroka c734781158 Merge pull request #25958 from Mic92/iwd
iwd: init at unstable-2017-04-21
2017-05-22 20:04:04 +03:00
Tim Steinbach aa73b7df30
linux: 4.12-rc1 -> 4.12-rc2 2017-05-22 11:40:04 -04:00
Frederik Rietdijk 99cfab07b9 Merge remote-tracking branch 'upstream/master' into HEAD 2017-05-22 09:21:40 +02:00
John Ericson 2e7ec6fb70 lib: Make platform predicates more ergonomic to use
`hostPlatform.isDarwin` instead of `lib.system.parse.isDarwin
hostPlatform.parsed`
2017-05-22 00:25:02 -04:00
Joachim Fasting 881385dbcb
linuxPackages.phc-intel: remove use of features.grsecurity
I believe this is the final reference to features.grsecurity.
See also e6c65ecb12
2017-05-21 18:08:07 +02:00
Jörg Thalheim a527a47cd3
iwd: init at unstable-2017-04-21 2017-05-21 11:05:35 +01:00
Tim Steinbach a42c54057f
linux: 4.11.1 -> 4.11.2 2017-05-20 17:17:35 -04:00
Tim Steinbach a551ca61b7
linux: 4.9.28 -> 4.9.29 2017-05-20 17:17:34 -04:00
Tim Steinbach 82852ac60e
linux: 4.4.68 -> 4.4.69 2017-05-20 17:17:33 -04:00
Tuomas Tynkkynen de263072b5 kernel: 4.10 is end-of-life
https://lkml.org/lkml/2017/5/20/75
2017-05-20 19:54:18 +03:00
Jörg Thalheim 0b21bd9dbd Merge pull request #25748 from armijnhemel/hwdata
hwdata: 0.291 -> 0.300
2017-05-20 17:40:31 +01:00
Vladimír Čunát 5aa530f2a8
Merge branch 'master' into staging
A few thousand rebuilds from master.
2017-05-19 08:57:59 +02:00
Nikolay Amiantov 030862f63c linuxPackages.evdi: init at 1.4.1 2017-05-19 02:53:09 +03:00
Nikolay Amiantov e17744067a displaylink: 1.1.62 -> 1.3.52 2017-05-19 02:51:45 +03:00
Joachim Fasting 77ed860114
linux_hardened: enable checks on scatter-gather tables
Recommended by kspp
2017-05-18 12:33:42 +02:00
Vladimír Čunát e9aeb55f3b
Merge branch 'master' into staging 2017-05-18 11:24:18 +02:00
Jörg Thalheim 64acaa1e2d Merge pull request #25646 from zx2c4/wg-psk-change
wireguard: 0.0.20170421 -> 0.0.20170517
2017-05-17 23:58:51 +01:00
John Ericson bec5ffee15 Merge pull request #25232 from obsidiansystems/cross-binutils
Cross binutils
2017-05-17 16:34:56 -04:00
John Ericson 7018dfb9f4 binutils and cctools: Prefix derivation names with target for cross
We want platform triple prefixes and suffixes on derivation names to
be used consistently. The ideom this commit strives for is

 - suffix means build != host, i.e. cross *built* packages. This is
   already done.

 - prefix means build != target, i.e. cross tools. This matches the
   tradition of such binaries themselves being prefixed to disambiguate.]
   Binutils and cctools, as build tools, now use the latter
2017-05-17 15:33:05 -04:00
John Ericson 88ea6463a3 binutils on darwin: Clean up the rats nest
- No more *Cross duplication for binutils on darwin either.
   `cctools_cross` is merged into plain `cctools`, so `buildPackages`
   chains alone are used to disambiguate.

 - Always use a mashup of cctools and actual GNU Binutils as `binutils`.
   Previously, this was only done in the native case as nobody had
   bothered to implement the masher in the cross case. Implemented it
   basically consisted of extending the wrapper to deal with prefixed
   binaries.
2017-05-17 15:33:05 -04:00
Jason A. Donenfeld ef018d8955 wireguard: 0.0.20170421 - 0.0.20170517
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2017-05-17 20:25:06 +02:00
Tim Steinbach 8eb302d6d7 Merge pull request #25792 from NeQuissimus/linux_4_12_rc1
linux-testing: 4.11-rc7 -> 4.12-rc1
2017-05-17 08:30:10 -04:00
Vladimír Čunát 515414ed32
Merge branch 'master' into staging 2017-05-16 18:32:43 +02:00
Vladimír Čunát 65ede052fa
treewide: fixup packages with RPATH problems 2017-05-16 18:30:58 +02:00
Tuomas Tynkkynen a35ec5dda6 linux_rpi: 1.20170303 -> 1.20170427 2017-05-15 11:14:59 +03:00
Tuomas Tynkkynen f2e2dde681 raspberrypifw: 1.20170303 -> 1.20170427 2017-05-15 11:14:59 +03:00
Tim Steinbach 336b044dcb
linux-testing: 4.11-rc7 -> 4.12-rc1 2017-05-14 22:03:14 -04:00
Tuomas Tynkkynen ba585648e7 kernel: 4.9.27 -> 4.9.28 2017-05-15 01:28:01 +03:00
Tuomas Tynkkynen 8de08ff145 kernel: 4.4.67 -> 4.4.68 2017-05-15 01:27:50 +03:00
Tuomas Tynkkynen c230aee121 kernel: 4.11 -> 4.11.1 2017-05-15 01:27:41 +03:00
Tuomas Tynkkynen 2f1e6c8686 kernel: 4.10.15 -> 4.10.16 2017-05-15 01:27:30 +03:00
Tuomas Tynkkynen eacfdc38f4 cryptsetup: 1.7.3 -> 1.7.5 2017-05-14 22:37:06 +03:00
Joachim Fasting e6c65ecb12
tree-wide: remove uses of features.grsecurity 2017-05-14 15:08:51 +02:00
Tuomas Tynkkynen d22b1d0ba1 hdparm: 9.51 -> 9.52 2017-05-14 13:47:29 +03:00
Armijn Hemel 6b9996f523 hwdata: 0.291 -> 0.300
webpage change, since fedorahosted is being shut down
2017-05-12 23:28:36 +02:00
Cray Elliott 4f51a1ef32 nvidia-x11: add dbus as a dependency to settings
for the latest beta release, the nvidia-settings binary will not compile
without dbus/dbus.h
2017-05-12 01:30:28 -07:00
Vladimír Čunát 165a6548ad
nvidia_x11_legacy340: fix patch URL to fix #25721
Using fixed-commit URLs and fetchpatch is just more robust.
2017-05-12 10:13:26 +02:00
Cray Elliott 11b8cfb506 nvidia_x11_beta: 378.13 -> 381.22
also remove nvidia 4.10 kernel patch as it is no longer needed
2017-05-11 17:53:19 -07:00
Linus Heckemann 89ce83688c nvidia-x11: fix linux 4.10 patch URL 2017-05-11 17:29:57 -07:00
Linus Heckemann 995d41c091 nvidia stable: 375.39 -> 375.66 2017-05-11 17:29:57 -07:00
Tim Steinbach 8584a16922
linux: 4.10.14 -> 4.10.15 2017-05-09 08:43:37 -04:00
Jörg Thalheim 2e2a5af81f
sysdig: 0.15.0 -> 0.16.0 2017-05-09 09:21:44 +01:00
Joachim Fasting 996b65cfba
linux_hardened: enable structleak plugin
A port of the PaX structleak plugin.  Note that this version of structleak
seems to cover less ground than the PaX original (only marked structs are
zeroed). [1]

[1]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=c61f13eaa1ee17728c41370100d2d45c254ce76f
2017-05-09 01:38:26 +02:00
Joachim Fasting 1816e2b960
linux_hardened: BUG on struct validation failure 2017-05-09 01:38:24 +02:00
Joachim Fasting a7ecdffc28
linux_hardened: move to 4.11
Note that DEBUG_RODATA has been split into STRICT_KERNEL_RWX &
STRICT_MODULE_RWX, which are on by default (non-optional).
2017-05-09 01:38:22 +02:00
Joachim Fasting 42c58cd2e8
linux_hardened: compile with stackprotector-strong
Default is regular, which we need to unset for kconfig to accept the new
value.
2017-05-09 01:38:21 +02:00
Eelco Dolstra e2700861fb
shadow: Fix hash 2017-05-08 16:56:05 +02:00
Tim Steinbach 8c74ff6534
linux: 4.9.26 -> 4.9.27 2017-05-08 09:26:26 -04:00
Tim Steinbach 4e2c67ff76
linux: 4.4.66 -> 4.4.67 2017-05-08 09:23:52 -04:00
Eelco Dolstra 7f6abddcd7
shadow: Fix using default shell in useradd
This caused "useradd xyzzy" to produce a user with no shell:

  xyzzy1002💯:/home/xyzzy:

https://github.com/shadow-maint/shadow/pull/33
2017-05-08 15:10:50 +02:00
Jörg Thalheim 192f8e7699
broadcom-bt-firmware: revert to unfree
license was misinterpreted, it is now only conditionally in the all
firmware list included, if `allowUnfree` is set.

fixes #25567
2017-05-08 09:18:11 +01:00
Joachim F 5250d3ec3d Merge pull request #25561 from joachifm/linux-gcc-plugins
linux: support using gcc plugins
2017-05-07 12:31:32 +01:00
Jörg Thalheim cc75ccbf64
broadcom-bt-firmware: change license to redistributal
see also: https://github.com/winterheart/broadcom-bt-firmware/blob/master/LICENSE.broadcom_bcm20702

fixes #25567
2017-05-07 07:33:41 +01:00
Joachim Fasting a04d8532c2
linux: support using gcc plugins
linux 4.8 onwards support gcc plugins.  This patch adds build inputs
required to make use of gcc plugins to the generic kernel build
environment.
2017-05-06 19:47:27 +02:00
Jörg Thalheim 7765e5971c
kernelPackages.zfsUnstable: 0.7.0-rc3 -> 0.7.0-rc4 2017-05-06 07:40:42 +01:00
Jörg Thalheim 4ea961ccc3
kernelPackages.splUnstable: 0.7.0-rc3 -> 0.7.0-rc4 2017-05-06 07:40:28 +01:00
Jörg Thalheim 3156ef2dfd Merge pull request #25478 from zraexy/zraexy-broadcom-bt-firmware
broadcom-bt-firmware: init at 12.0.1.1011
2017-05-04 22:33:06 +01:00
Jörg Thalheim d072ef956d broadcom-bt-firmware: mention package limitations 2017-05-04 22:32:55 +01:00
Tim Steinbach 2a38ecc055
linux: 4.10.13 -> 4.10.14 2017-05-03 20:46:48 -04:00
Tim Steinbach 6076843be3
linux: 4.9.25 -> 4.9.26 2017-05-03 20:44:09 -04:00
Tim Steinbach af933bc7d3
linux: 4.4.65 -> 4.4.66 2017-05-03 20:41:46 -04:00
zraexy d900478e3c broadcom-bt-firmware: init at 12.0.1.1011
broadcom-bt-firmware: init at 12.0.1.1011
2017-05-03 12:51:32 -08:00
zraexy 7845163d6a bt-fw-converter: init at 2017-02-19 2017-05-03 12:51:24 -08:00
Cray Elliott cebce78be9 mwprocapture: fix compile on linux 4.11 2017-05-03 00:11:22 -07:00
Victor Calvert 3d27a84a1c tomb: 2.2 -> 2.4 (#25465) 2017-05-03 00:32:51 +01:00
Jörg Thalheim 7be7902990
zfsUnstable: mark as incompatible with 4.11 (since rc3) 2017-05-02 18:15:53 +02:00
Tim Steinbach b5169fd277
linux: Add cgroups patches for 4.9, 4.10, 4.11 2017-05-02 08:49:39 -04:00
Vladimír Čunát d7501b986a
luajit: 2.1.0-beta2 -> 2.1.0-beta3
The removal of `luaL_reg` alias caused lots of breakage.
Only sysdig and knot-resolver needed (also) other changes.
2017-05-02 14:00:45 +02:00
Shea Levy 207a0af06a Add linux 4.11 2017-05-01 19:04:45 -04:00
Jörg Thalheim 95f6bece88
wpa_supplicant: upgrade to qt5
also inkscape removal patch, as it introduced a bug: #25320
fixes #25320 #25325
2017-05-01 21:23:22 +02:00
Armijn Hemel 5b0dcf95a0 atop: 2.2-3 -> 2.3.0 2017-05-01 14:45:27 +02:00
Michael Raskin 9c39666613 Merge pull request #25107 from armijnhemel/guvcview
guvcview: 2.0.4 -> 2.0.5
2017-05-01 14:15:07 +02:00
Michael Raskin 1cce0887ee Merge branch 'master' into mptcp-v91.3 2017-05-01 00:43:08 +02:00