Commit graph

4232 commits

Author SHA1 Message Date
William A. Kennington III
974b9cc8cc kernel: 4.1.4 -> 4.1.5 2015-08-10 23:34:31 -07:00
William A. Kennington III
9f79c1e6eb kernel: 3.18.19 -> 3.18.20 2015-08-10 23:34:31 -07:00
William A. Kennington III
5e33890995 kernel: 3.12.45 -> 3.12.46 2015-08-10 23:31:07 -07:00
William A. Kennington III
5fe578d706 kernel: 3.10.85 -> 3.10.86 2015-08-10 23:30:59 -07:00
Charles Strahan
8b91812de6 pipework: init at 2015-07-30
Pipework lets you connect together containers in arbitrarily complex
scenarios. Pipework uses cgroups and namespace and works with "plain"
LXC containers (created with lxc-start), and with the awesome Docker.
2015-08-10 15:01:34 -04:00
Vladimír Čunát
6cf49480a6 Merge #9094: ati-drivers: 14.12 -> 15.7, fix builds
... with newer kernels up to 4.1 (including).
2015-08-10 08:43:49 +02:00
William A. Kennington III
6e698f9c61 Merge branch 'master.upstream' into staging.upstream 2015-08-09 13:34:18 -07:00
Michael Raskin
eee6f2801f sysdig: 0.1.101 -> 0.1.102 2015-08-08 21:01:31 +03:00
William A. Kennington III
4624985561 Merge branch 'master.upstream' into staging.upstream 2015-08-07 13:40:39 -07:00
Tobias Geerinckx-Rice
a849b16052 radeontop: 2015-06-24 -> 2015-08-06
Adds support for Topaz, Tonga, and Carrizo + new R600 PCI IDs.
2015-08-06 16:21:59 +02:00
William A. Kennington III
926f073f55 Merge branch 'master.upstream' into staging.upstream 2015-08-04 15:32:43 -07:00
Jonathan Rudenberg
921055b4a8 kernel: Enable DRM_LOAD_EDID_FIRMWARE
This allows specifying drm_kms_helper.edid_firmware to work around displays
that provide bad EDID data.

Documentation: https://www.osadl.org/Single-View.111+M5ec938a7b3b.0.html
2015-08-04 16:38:38 -04:00
William A. Kennington III
04f1b451d7 kernel: 3.14.48 -> 3.14.49 2015-08-04 13:30:08 -07:00
William A. Kennington III
79fb844213 kernel: 4.0.8 -> 4.0.9 2015-08-04 13:28:46 -07:00
William A. Kennington III
a5d6e61c2f grsecurity: Push testing from 4.0 -> 4.1 2015-08-04 13:28:16 -07:00
Daniel Fox Franke
d7443ffb89 Only use underscored versions of read_cr4 and write_cr4 in 3.18 and above.
I'm not sure precisely in what micro-version the API change was made, so
the check for 3.18.0 and above may not be quite correct. But it's at
least sufficient for every version currently included in NixOS.
2015-08-03 21:42:08 -04:00
ts468
5ef9a427cf Merge pull request #9107 from ts468/upstream.ima
ima-evm-utils: init at 1.0.0
2015-08-04 01:38:46 +02:00
Thomas Strobel
c31dc22aa2 ima-evm-utils: init at 1.0.0 2015-08-04 01:10:13 +02:00
William A. Kennington III
a2da9cfcaf Merge branch 'master.upstream' into staging.upstream 2015-08-03 14:27:14 -07:00
William A. Kennington III
ce6b96db6e kernel-testing: 4.2.0-rc2 -> 4.2.0-rc5 2015-08-03 13:06:22 -07:00
William A. Kennington III
102cfc53bc kernel: 4.1.3 -> 4.1.4 2015-08-03 12:58:12 -07:00
William A. Kennington III
678efd6df0 kernel: 3.12.44 -> 3.12.45 2015-08-03 12:58:12 -07:00
William A. Kennington III
1684ec0bfc kernel: 3.10.84 -> 3.10.85 2015-08-03 12:58:12 -07:00
Daniel Fox Franke
17fb7ac352 ati-drivers: give the patch file a more sensible name
It makes several API fixes for several kernel versions so stop trying to
enumerate them all in the filename.
2015-08-03 00:46:29 -04:00
Daniel Fox Franke
6f2db8fe44 ati-drivers: Fixes for kernel 4.1.
* IRQF_DISABLED was already a no-op in recent kernels, has now been
  removed.
* strnicmp is renamed to strncasecmp.
2015-08-03 00:36:30 -04:00
Daniel Fox Franke
1d3207b27b ati-drivers: update to Catalyst 15.7 and fix build with recent kernels 2015-08-03 00:14:36 -04:00
William A. Kennington III
09b4a7cc1b Merge branch 'master.upstream' into staging.upstream 2015-07-31 17:26:20 -07:00
William A. Kennington III
85e2c8ff23 lxc: Cleanup 2015-07-31 17:11:11 -07:00
William A. Kennington III
7a6b3bf688 cgmanager: 0.36 -> 0.37 2015-07-31 17:11:11 -07:00
William A. Kennington III
c53a13fe0e policycoreutils: 2.3 -> 2.4 2015-07-31 17:11:11 -07:00
William A. Kennington III
3ada013455 setools: 3.3.8 -> 2015-02-12 2015-07-31 17:11:11 -07:00
William A. Kennington III
f6e554f288 selinux: Use fstack-protector=all 2015-07-31 17:11:11 -07:00
William A. Kennington III
c06b1d84f1 sepolgen: 1.2.1 -> 1.2.2 2015-07-31 17:11:11 -07:00
William A. Kennington III
f23406c0e2 libsemanage: 2.3 -> 2.4 2015-07-31 17:11:11 -07:00
William A. Kennington III
0b191e565b checkpolicy: 2.3 -> 2.4 2015-07-31 17:11:10 -07:00
William A. Kennington III
b18a354c88 libselinux: 2.3 -> 2.4 2015-07-31 17:11:10 -07:00
William A. Kennington III
ffa1782688 libsepol: 2.3 -> 2.4 2015-07-31 17:11:10 -07:00
Tobias Geerinckx-Rice
6c6201a99b Remove unnecessary rec{s from "my" packages 2015-07-31 02:02:07 +02:00
William A. Kennington III
7ebe164ae0 Merge branch 'master.upstream' into staging.upstream 2015-07-30 15:03:10 -07:00
Vladimír Čunát
374210aece nvidia-x11: maintenance update
Strange as it is, nvidia seems to drop UVM kernel module on 32-bit.
Basic driver usage shows no problems for me.
2015-07-30 15:35:02 +02:00
William A. Kennington III
aaef42ab8c Merge branch 'master.upstream' into staging.upstream 2015-07-29 10:23:08 -07:00
viric
982ce5ed58 Merge pull request #8978 from dezgeg/pr-arm-images
ARM SD card image expressions
2015-07-29 14:13:57 +02:00
Tobias Geerinckx-Rice
c71d93c519 mcelog: 121 -> 122
Enable IMC status bank for Haswell-E, as described in Intel SDM Vol.3C
Table 35-27.
2015-07-28 23:19:35 +02:00
Vladimír Čunát
0c4e4e6849 Merge branch 'master' into staging
There was a mass-rebuild due to expat CVE.
2015-07-28 13:09:43 +02:00
Spencer Janssen
ebe67d3c85 nvidia-x11: add a symlink for libGLESv2.so.2 (close #9024)
nvidia's EGL stack looks for libGLESv2.so.2 at runtime (confirmed by
watching strace), however builder.sh only provides a libGLESv2.so.1
symlink.

@vcunat ported to legacy_340; older ones don't produce GLES.
2015-07-28 12:43:58 +02:00
Vladimír Čunát
ff219393ca nvidia_x11_beta: fix build by syncing with default
/cc author @wkennington.
2015-07-28 12:41:13 +02:00
Edward Tjörnhammar
e6bdca625a iproute: prefix CONFDIR so that all files are not directly under /etc 2015-07-28 11:44:18 +02:00
Nikolay Amiantov
c40e9abc93 android-udev-rules: update package 2015-07-28 12:33:30 +03:00
William A. Kennington III
6b55ca513d Merge branch 'master.upstream' into staging.upstream 2015-07-27 16:11:03 -07:00
William A. Kennington III
5792b1345a iproute: Actually don't install docs 2015-07-27 09:24:49 -07:00
William A. Kennington III
fa0b84c446 iproute: Fix reference to /etc instead of /etc at runtime 2015-07-27 09:24:33 -07:00
William A. Kennington III
bd5f2c9638 Merge branch 'master.upstream' into staging.upstream 2015-07-27 08:17:19 -07:00
Eelco Dolstra
165406e1af nvidia-x11: Remove runtime dependency on linux.dev 2015-07-26 22:45:39 +02:00
Vladimír Čunát
b875ea5d29 Merge branch 'master' into staging 2015-07-26 17:57:46 +02:00
Eelco Dolstra
a951f11021 Move some more gtk-docs to the doc output 2015-07-26 13:43:49 +02:00
Edward Tjörnhammar
80533a5043 iproute: 4.0.0 -> 4.1.1 2015-07-26 00:17:22 +02:00
Nathaniel Baxter
6bff6eec67 v4l2loopback: update 0.8.0 -> 0.9.1 2015-07-25 11:59:09 +10:00
Austin Seipp
61e0e56839 nixpkgs: perf-tools 20150704 -> 20150723
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-07-24 00:31:45 -05:00
Vladimír Čunát
af2ab0b911 remove gcc49 overrides from various places
An interesting thing is that: stdenv != overrideCC stdenv gcc49;
I'm not sure why that is, but it doesn't seem important.

/cc maintainers: @nckx, @garbas, @abbradar, @cstrahan, @grwlf.

(cherry picked from commit 3064b6a0cc)
2015-07-23 11:53:18 +02:00
William A. Kennington III
24c13dfa81 kernel: 4.1.2 -> 4.1.3 2015-07-22 13:14:27 -07:00
William A. Kennington III
612d19e8b4 kernel: 3.18.18 -> 3.18.19 2015-07-22 13:14:27 -07:00
William A. Kennington III
17b924bb9f linux-firmware: 2015-07-12 -> 2015-07-23 2015-07-22 12:33:27 -07:00
William A. Kennington III
c034e966bf zfs_git: 2015-05-13 -> 2015-07-21 2015-07-22 12:22:15 -07:00
William A. Kennington III
b6cd7e754b spl_git: 2015-06-29 -> 2015-07-21 2015-07-22 12:22:15 -07:00
Vladimír Čunát
3064b6a0cc remove gcc49 overrides from various places
An interesting thing is that: stdenv != overrideCC stdenv gcc49;
I'm not sure why that is, but it doesn't seem important.

/cc maintainers: @nckx, @garbas, @abbradar, @cstrahan, @grwlf.
2015-07-22 19:40:12 +02:00
Tuomas Tynkkynen
82d0acaf37 kernel-config: Explicitly enable NAMESPACES
Namespace support is required by the `unshare` tool used in
`nixos-install`. It's enabled by the x86 defconfig, but not by
e.g. multi_v7_defconfig. So enable it here so that `nixos-install`
can work on ARM.
2015-07-22 16:08:17 +03:00
Tuomas Tynkkynen
ec43c69b5d linux-rpi: Fix modDirVersion
This causes build breakage on staging due to #7524.
2015-07-22 16:08:17 +03:00
Eelco Dolstra
9a75bafcda systemd-timesyncd: Use NTP servers from our own ntp.org pool
(cherry picked from commit 01dc343c2c)

Conflicts:
	pkgs/os-specific/linux/systemd/default.nix
2015-07-22 12:27:50 +02:00
Eelco Dolstra
069b4a8a57 Remove Linux 3.2 and 3.4
These are not supported by systemd so no reason to keep them around.

(cherry picked from commit ee10e165dc)

Conflicts:
	pkgs/os-specific/linux/kernel/linux-3.4.nix
2015-07-22 12:25:32 +02:00
Eelco Dolstra
bb5647ea0f Remove unused file
(cherry picked from commit 58ef0eea0c)
2015-07-22 12:25:11 +02:00
Eelco Dolstra
2c48ab4390 Remove ancient version of udev
(cherry picked from commit ab91aaaeb8)
2015-07-22 12:24:24 +02:00
Luca Bruno
6f5aa25e89 Revert "zfs_git: 2015-06-22 -> 2015-07-01"
This reverts commit 54022375eb.

Revert "zfs_git: 2015-05-13 -> 2015-06-22"

This reverts commit 59faa759da.

Closes #8941
2015-07-22 10:31:28 +02:00
Luca Bruno
f50e327510 gradm: fix download (ZHF) 2015-07-22 10:04:00 +02:00
Austin Seipp
d2986a9398 nixpkgs: remove linuxPackages.ktap
It's been broken on the latest 3 major kernels, and it seems development
has stalled unfortunately, so this should be pulled.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-07-21 18:27:58 -05:00
Austin Seipp
a5e1b8db8f nixpkgs: pax-utils 1.0.4 -> 1.0.5
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-07-21 17:00:19 -05:00
Edward Tjörnhammar
bed11354e9 Merge pull request #8902 from dezgeg/pr-nfs
nfs-utils, rpcbind: Update packages to fix nfs3 test
2015-07-21 16:48:38 +02:00
Austin Seipp
b81c21428c nixpkgs: pax-utils 1.0.3 -> 1.0.4
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-07-20 13:52:34 -05:00
Austin Seipp
71d4b4baae nixpkgs: lockdep 3.19.1 -> 4.1.2
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-07-20 13:52:33 -05:00
Vladimír Čunát
e4fcddf177 statifier: fix meta.platforms syntax 2015-07-20 12:32:01 +02:00
Tuomas Tynkkynen
4f928f3550 nfs-utils: 1.2.5 -> 1.3.2, potentially fixes CVE-2013-1923 2015-07-20 12:20:42 +03:00
William A. Kennington III
70a1e7afd8 pam: 1.2.0 -> 1.2.1
Fixes CVE-2015-3238
2015-07-19 12:22:51 -07:00
William A. Kennington III
25e60feb72 Merge branch 'master.upstream' into staging.upstream 2015-07-15 02:02:46 -07:00
William A. Kennington III
52b78864a8 firmware-linux-nonfree: 2015-06-30 -> 2015-07-12 2015-07-13 23:53:13 -07:00
aszlig
45135c0256
linux-testing: Update to version 4.2.0-rc2.
Upstream diff of changes can be found at:

https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/diff/?id=v4.2-rc2&id2=v4.2-rc1&dt=2

Not tested on my machine right now (well, it's "testing" after all), but
verified the SHA256 from two different connections.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-07-14 07:31:18 +02:00
William A. Kennington III
333f145d76 Merge branch 'master.upstream' into staging.upstream 2015-07-13 15:11:31 -07:00
Arseniy Seroka
c01539790b Merge pull request #8555 from fpletz/pkg/jool
jool: init at 3.3.2
2015-07-12 22:20:18 +03:00
Tuomas Tynkkynen
91cbd8a3b2 firejail: Fix source URL
This particular sf.net mirror is down.
2015-07-12 21:12:06 +02:00
Tuomas Tynkkynen
5fbd08968b can-utils: Source is now hosted at GitHub
Gitorious doesn't exist any more.
2015-07-12 21:01:57 +02:00
Franz Pletz
a21ead3d62 jool: init at 3.3.2
Jool is a SIIT and a NAT64 implementation for Linux.
2015-07-12 07:25:44 +02:00
William A. Kennington III
0245b28796 kernel: 3.14.47 -> 3.14.48 2015-07-11 20:15:05 -07:00
William A. Kennington III
3284b216a4 kernel: 4.0.7 -> 4.0.8 2015-07-11 20:15:05 -07:00
William A. Kennington III
75b7938ba2 kernel: 4.1.1 -> 4.1.2 2015-07-11 20:15:05 -07:00
William A. Kennington III
680e2ced04 kernel: 3.18.17 -> 3.18.18 2015-07-11 20:15:05 -07:00
William A. Kennington III
4529105271 kernel: 3.10.82 -> 3.10.84 2015-07-11 20:15:05 -07:00
William A. Kennington III
bf32753cd9 hdparm: 9.45 -> 9.48 2015-07-09 17:30:35 -07:00
William A. Kennington III
97a2fcdc24 bluez5: 5.31 -> 5.32 2015-07-09 17:30:35 -07:00
Eelco Dolstra
5c9f437d2f linux: 3.14.46 -> 3.14.47
CVE-2014-7822
2015-07-09 15:10:12 +02:00
Pascal Wittmann
b847dec4a0 eudev: disable install-exec-hook target (ZHF) 2015-07-09 12:28:24 +02:00
Tuomas Tynkkynen
88e43eb39b powertop: Patch out path to /sbin/modprobe (close #8702)
The modprobe call is made via system(), so an absolute path is not
needed if modprobe is in PATH. Which it is by default at least in
NixOS and Arch.

Fixes #5424.
2015-07-09 11:57:38 +02:00
William A. Kennington III
e587d3e155 Merge branch 'master.upstream' into staging.upstream 2015-07-07 00:31:00 -07:00
William A. Kennington III
3cfc6fa38a linux-firmware: 2015-05-13 -> 2015-06-30
Use iwlwifi/linux-firmware temporarily since the firmware for kernel
4.1+ is not mainlined in firmware/linux-firmware.
2015-07-06 18:31:13 -07:00
William A. Kennington III
310ad36a4d Merge branch 'master.upstream' into staging.upstream 2015-07-06 17:49:35 -07:00
William A. Kennington III
06e146b2ce syslinux: Fix failed loading on gcc5 2015-07-06 17:49:07 -07:00
William A. Kennington III
ae28ff8b91 Merge branch 'master.upstream' into staging.upstream 2015-07-06 17:15:11 -07:00
William A. Kennington III
2f28600f2b lvm2: 2.02.120 -> 2.02.124 2015-07-06 17:13:50 -07:00
William A. Kennington III
b363927556 linux-testing: 4.2-rc1 2015-07-06 13:45:03 -07:00
William A. Kennington III
d605663ae2 Merge branch 'master.upstream' into staging.upstream 2015-07-05 13:06:02 -07:00
Michael Raskin
eafecd1fd2 perf-tools: update to a fresher git snapshot 2015-07-05 00:32:54 +03:00
Michael Raskin
2f5e534841 eudev: update 3.1.1 -> 3.1.2 2015-07-05 00:32:53 +03:00
Michael Raskin
e8f4be94e2 atop: update 2.1-1 -> 2.2-3 2015-07-05 00:32:53 +03:00
Thomas Strobel
5a5587ba6d pam_mount: fix PATH issue 2015-07-04 16:36:47 +02:00
Charles Strahan
44594e851c xsensors: init at 0.70 2015-07-03 22:55:10 -04:00
Edward Tjörnhammar
6257425dab linuxPackages.nvidia_x11_legacy340: fix cr4 references
Patch was copied from here:
https://devtalk.nvidia.com/default/topic/813458/linux-4-0-rc1-346-47-build-error-_cr4-functions-fix/

Reference to kernel change, also noted in the forum post:
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/arch/x86/include/asm/paravirt.h?id=1e02ce4cccdcb9688386e5b8d2c9fa4660b45389
2015-07-03 09:32:14 +02:00
Tobias Geerinckx-Rice
63041a7ecb kexec-tools: 2.0.9 -> 2.0.10 2015-07-03 04:28:43 +02:00
William A. Kennington III
7735b2e4c5 udisks: 2.1.4 -> 2.1.6 2015-07-02 09:05:15 -07:00
Thomas Strobel
31ba3ab30d pam_mount: version update: 2.14 -> 2.15 2015-07-02 16:49:35 +02:00
William A. Kennington III
54022375eb zfs_git: 2015-06-22 -> 2015-07-01 2015-07-01 22:52:09 -07:00
William A. Kennington III
f6f9b9574d zfs: 0.6.4.1 -> 0.6.4.2 2015-07-01 22:50:49 -07:00
William A. Kennington III
ca5c1e4187 spl_git: 2015-06-10 -> 2015-06-29 2015-07-01 22:49:36 -07:00
William A. Kennington III
4fc07740c6 spl: 0.6.4.1 -> 0.6.4.2 2015-07-01 22:48:21 -07:00
Tobias Geerinckx-Rice
1ea70323d6 mcelog: 120 -> 121 2015-07-02 03:35:35 +02:00
William A. Kennington III
7eae48871f Merge branch 'master.upstream' into staging.upstream 2015-07-01 13:38:17 -07:00
Shea Levy
145768bf9b Unmaintain a bunch of packages 2015-07-01 08:11:05 -04:00
William A. Kennington III
612f0bdd67 Merge branch 'master.upstream' into staging.upstream 2015-06-30 23:58:07 -07:00
William A. Kennington III
d64b3c8a5c kernel: 3.14.45 -> 3.14.46 2015-06-30 11:28:59 -07:00
William A. Kennington III
43eda80b09 kernel: 3.18.16 -> 3.18.17 2015-06-30 11:20:41 -07:00
William A. Kennington III
b25930c4c8 kernel: 4.0.6 -> 4.0.7 2015-06-30 11:20:41 -07:00
William A. Kennington III
3f7d195762 kernel: 4.1 -> 4.1.1 2015-06-30 11:20:40 -07:00
William A. Kennington III
34cb1a202b kernel: 3.10.81 -> 3.10.82 2015-06-30 11:16:21 -07:00
Pascal Wittmann
512225ef81 Fixed some descriptions 2015-06-29 16:20:58 +02:00
William A. Kennington III
ef253212f4 Merge branch 'master.upstream' into staging.upstream 2015-06-26 17:25:49 -07:00
Domen Kožar
f895960e84 Merge pull request #8256 from dezgeg/pr-i686-kconfig
kernel-config: Fix 4.0 build on 32-bit
2015-06-26 13:23:35 +02:00
Thomas Tuegel
a8c52d0958 Merge branch 'master' into staging 2015-06-25 09:15:05 -05:00
William A. Kennington III
59faa759da zfs_git: 2015-05-13 -> 2015-06-22 2015-06-24 23:41:46 -07:00
William A. Kennington III
6af1fe3519 spl_git: 2015-04-24 -> 2015-06-10 2015-06-24 23:41:45 -07:00
William A. Kennington III
2a8cf39952 zfs: Fix kernel 4.1 compat 2015-06-24 23:33:28 -07:00
William A. Kennington III
b08d384da8 kernel: 3.14.44 -> 3.14.45 2015-06-24 18:12:20 -07:00
William A. Kennington III
2f255eafd9 kernel: 4.0.5 -> 4.0.6 2015-06-24 18:11:25 -07:00
William A. Kennington III
16e0a98483 kernel: 3.10.80 -> 3.10.81 2015-06-24 18:09:40 -07:00
Cillian de Róiste
df92d1c711 xf86_input_wacom: update from 0.29.0 to 0.30.0 2015-06-24 17:23:23 +02:00
Tobias Geerinckx-Rice
97ae36691e radeontop 2015-05-28 -> 2015-06-24
New features:
- Make coloured output toggleable

Fixes:
- Release libpciaccess resources
- Make the check for quit case-insensitive
2015-06-24 16:43:04 +02:00
William A. Kennington III
c6e512b80c Merge branch 'master.upstream' into staging.upstream 2015-06-22 12:43:12 -07:00
William A. Kennington III
bd9433c90d kernel: Add version 4.1 latest 2015-06-22 12:41:23 -07:00
William A. Kennington III
c48433d575 kernel: 3.4.107 -> 3.4.108 2015-06-22 12:35:56 -07:00
William A. Kennington III
282d03befa Merge branch 'master.upstream' into staging.upstream 2015-06-22 10:57:36 -07:00
Vladimír Čunát
783af9a960 wpa_supplicant: disable TLS-1.2 for now (fixes #8332) 2015-06-22 17:33:49 +02:00
Jascha Geerds
3f66bb7ff2 Add myself as maintainer 2015-06-22 08:26:09 +02:00
Robin Gloster
45be5244a4 Wrap the python scripts in lxc 2015-06-19 14:34:09 +02:00
Eelco Dolstra
fef6141662 Revert "procps-ng: Refactor a bit"
This reverts commit dceff137e1. It was
described as a "refactoring", but actually made procps depend on
systemd (which is a heavy dependency) and changed the name of the
package.
2015-06-19 14:14:52 +02:00
William A. Kennington III
ad9081411c kmod: 20 -> 21 2015-06-18 23:51:12 -07:00