Commit graph

70 commits

Author SHA1 Message Date
Robin Gloster 33e1c78ae3 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-16 07:54:01 +00:00
Robin Gloster a37d695c95 linuxPackages.spl: remove unnecessary substituteInPlace
`substituteInPlace` was operating on a non-existant file.
Updated to use `autoreconfHook`.
2016-08-14 22:55:21 +00:00
Robin Gloster 2d382f3d98 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-30 19:39:34 +00:00
Nahum Shalman 5420f7f6e0 spl: 0.6.5.6 -> 0.6.5.7 (#15669) 2016-05-24 16:24:17 +02:00
Franz Pletz 2e08d8234e Merge remote-tracking branch 'origin/master' 2016-03-31 10:06:30 +02:00
Louis Taylor 307c073fa3 spl: 0.6.5.5 -> 0.6.5.6 2016-03-29 13:28:20 +01:00
Robin Gloster f60c9df0ba Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-28 15:16:29 +00:00
Joachim Fasting 2a097803d4 spl: mark as broken on grsec kernels
All hydra builds against grsec kernels fail; non-grsec kernels
succeed.
2016-03-27 01:39:07 +01:00
Ricardo M. Correia 56f7fb9a04 spl: 0.6.5.4 -> 0.6.5.5 2016-03-15 18:31:07 +01:00
Franz Pletz aff1f4ab94 Use general hardening flag toggle lists
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
2016-03-05 18:55:26 +01:00
Robin Gloster 7c206e8c4c linuxPackages.spl: no pic hardening 2016-02-07 22:45:34 +00:00
Ricardo M. Correia fe53cb56d9 spl: 0.6.5.3 -> 0.6.5.4 2016-01-19 16:34:14 +01:00
William A. Kennington III e57217d874 spl: 0.6.5.2 -> 0.6.5.3 2015-11-02 11:01:17 -08:00
Ricardo M. Correia 42104219f7 spl: 0.6.5 -> 0.6.5.2 2015-10-05 12:58:19 +02:00
Eelco Dolstra 0e3c1e31b1 Remove zfs-git and spl-git
See https://github.com/NixOS/nixpkgs/pull/10042#commitcomment-13422343.
2015-09-29 14:54:12 +02:00
William A. Kennington III 9cb93e7966 spl: Update to 0.6.5 2015-09-11 17:45:38 -07:00
William A. Kennington III bdbe9fc172 spl_git: 2015-07-21 -> 2015-08-25 2015-08-31 00:09:02 -07:00
William A. Kennington III b6cd7e754b spl_git: 2015-06-29 -> 2015-07-21 2015-07-22 12:22:15 -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
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 d87d7aa503 spl_git: 2015-04-08 -> 2015-04-24 2015-05-15 18:38:13 -07:00
Ricardo M. Correia a46066219c spl: Update from 0.6.4 -> 0.6.4.1 2015-05-02 01:05:08 +02:00
William A. Kennington III 983845d78a spl_git: 2015-04-03 -> 2015-04-08 2015-04-09 13:21:46 -07:00
William A. Kennington III 758c8e5c5d spl: 0.6.3 -> 0.6.4 2015-04-09 13:21:46 -07:00
William A. Kennington III f64ddc181c spl_git: 2015-03-25 -> 2015-04-03 2015-04-04 20:11:08 -07:00
William A. Kennington III c7bf9d2749 spl_git: 2015-03-20 -> 2015-03-25 2015-03-27 15:50:47 -07:00
William A. Kennington III d071563006 spl_git: 2015-03-03 -> 2015-03-20 2015-03-22 12:20:38 -07:00
Ricardo M. Correia 1e28cd0c83 spl: Update from 0.6.3-1.2 -> 0.6.3-1.3
Removed time.patch (applied upstream).
2015-03-19 06:07:54 +01:00
William A. Kennington III bc49764fe2 spl_git: 2015-02-27 -> 2015-03-03 2015-03-06 11:56:43 -08:00
William A. Kennington III 21ce0493f5 spl_git: 2015-02-04 -> 2015-02-27 2015-03-03 12:58:43 -08:00
William A. Kennington III a6ea74ac6a spl_git: Use date format 2015-02-25 11:53:14 -08:00
William A. Kennington III 7ae9c92f92 spl: Fix bad copy paste 2015-02-07 17:18:15 -08:00
William A. Kennington III 161e9648e4 spl: Make naming more consistent with zfs 2015-02-07 15:21:30 -08:00
William A. Kennington III 91e6126a32 spl: Modularize and create a userspace only package 2015-02-07 15:07:38 -08:00
William A. Kennington III fe03dc1a10 spl_git: Update to latest 2015-02-07 13:51:37 -08:00
William A. Kennington III c7268fb4bf spl_git: Update 2015-02-01 16:00:03 -08:00
Ricardo M. Correia e0336a504e spl: Fix mtime going backwards in time
Fixes #5652.
2015-01-18 18:21:35 +01:00
William A. Kennington III a47b064595 spl: Update git 2015-01-02 11:38:31 -08:00
William A. Kennington III 7e8eea59ee spl: 0.6.3 -> 0.6.3-1.2 2014-12-23 17:05:02 -08:00
Ricardo M. Correia ebfb506036 spl: Backport compatibility patches for newer kernels 2014-10-07 16:52:14 +02:00
Ricardo M. Correia b5b8b5247a spl, spl.git: Update to 0.6.3 2014-06-23 15:52:20 +02:00
Ricardo M. Correia 1c2aacb5d8 spl: Fix compilation with grsecurity's constify plugin and kernels < 3.8 2014-05-15 13:25:47 +02:00
Ricardo M. Correia 419a71e1e5 spl, zfs: Add git versions, based on recent commits
Upstream has not been tagging new versions for a long time, but we need
compatibility with newer kernels. The 0.6.2 versions already have a bunch of
backported compatibility patches, but 3.14 kernels need even more.

Also, the git versions have fixed a bunch of crashes and other bugs, so perhaps
we should just bite the bullet and just use recent git versions (as sometimes
upstream recommends, when people run into bugs).

This adds a new "boot.zfs.useGit" boolean option, so that a user can
easily opt into using the git versions.
2014-04-23 01:42:52 +02:00
Ricardo M. Correia 3c97fdc7a8 spl, zfs: Add myself as a maintainer 2014-03-15 02:01:57 +01:00
Ricardo M. Correia c5b3257388 spl: Fix compilation on 3.13 and later kernels 2014-03-04 12:58:55 +01:00
Ricardo M. Correia 17073197e9 spl: Fix compilation on 3.12 and later kernels 2014-03-04 12:58:39 +01:00
Shea Levy a589bfae17 Update and fix kernel packages to new kernel build
In most cases, this just meant changing kernelDev (now removed from
linuxPackagesFor) to kernel.dev. Some packages needed more work (though
whether that was because of my changes or because they were already
broken, I'm not sure). Specifics:

* psmouse-alps builds on 3.4 but not 3.10, as noted in the comments that
  were already there
* blcr builds on 3.4 but not 3.10, as noted in comments that were
  already there
* open-iscsi, ati-drivers, wis-go7007, and openafsClient don't build on
  3.4 or 3.10 on this branch or on master, so they're marked broken
* A version-specific kernelHeaders package was added

The following packages were removed:

* atheros/madwifi is superceded by official ath*k modules
* aufs is no longer used by any of our kernels
* broadcom-sta v6 (which was already packaged) replaces broadcom-sta
* exmap has not been updated since 2011 and doesn't build
* iscis-target has not been updated since 2010 and doesn't build
* iwlwifi is part of mainline now and doesn't build
* nivida-x11-legacy-96 hasn't been updated since 2008 and doesn't build

Everything not specifically mentioned above builds successfully on 3.10.
I haven't yet tested on 3.4, but will before opening a pull request.

Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-04 21:17:04 -05:00
Jack Cummings fc101c01a5 zfs-0.6.2 and spl-0.6.2
Enable parallelBuilding, too.
2013-08-23 23:20:03 -07:00
Jack Cummings 4c37edd6f3 Don't need NIX_CFLAGS_COMPILE in spl build anymore, consolodate zfs patches. 2013-04-06 00:06:27 -07:00