Commit Graph

103645 Commits

Author SHA1 Message Date
Jörg Thalheim
ebeb8901a2 Merge #27074: kmod-debian-aliases: Fix source tarball URL.
(cherry picked from commit 02ce696304)
2017-07-03 08:44:59 +02:00
Vladimír Čunát
65904657b5 Merge #27076: mariadb: fix URL for source tarball
Not even all their mirrors serve our version, unfortunately.

(cherry picked from commit cc83f35118)
2017-07-03 08:43:22 +02:00
Vladimír Čunát
8ad1e63e79 Merge #27075: p7zip: Update CVE-2016-9296 patch URL
(cherry picked from commit 1f0de2dce2)
2017-07-03 08:22:53 +02:00
Vladimír Čunát
057f89b934 lib/maintainers: add zxc24 to fix evaluation
Broken by 03a00c39d.
2017-07-01 11:32:17 +02:00
Vladimír Čunát
0476a06415 texlive.combine: fix perl scripts without a shebang
Fixes #24343.  These parts of upstream texlive are really ugly.
Also improve variable quoting in the code around.

(cherry picked from commit 8dddd2b672)
The change seems safe enough.
2017-07-01 11:29:15 +02:00
Tomas Hlavaty
ccd6ec20e1 ccl: create ccl symlink
Make it more intuitive for users to start ccl and avoid platform
dependent executable names.

https://github.com/NixOS/nixpkgs/issues/26934
(cherry picked from commit ad82538423)
It seems a rather safe change.
2017-07-01 10:32:08 +02:00
Peter Simons
84eeefe294 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.2.1-13-g5c18fb5 from Hackage revision
04f3948836.
2017-06-30 22:43:24 +02:00
Peter Simons
180bbd462b haskell: copy current state from master branch (LTS 8.20) 2017-06-30 22:43:23 +02:00
Tim Steinbach
8a8bc4f55d Merge pull request #26988 from taku0/firefox-bin-54.0.1
firefox, firefox-bin: 54.0 -> 54.0.1,  firefox-esr: 52.2.0esr -> 52.2.1esr

(cherry picked from commit 7f9ec267a6)
2017-06-30 08:51:55 -04:00
Jason A. Donenfeld
ce3a705810 wireguard: 0.0.20170613 -> 0.0.20170629
Simple version bump.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
(cherry picked from commit 9ffccc77d9)
2017-06-30 08:43:39 +01:00
Jason A. Donenfeld
03a00c39db wireguard: 0.0.20170531 -> 0.0.20170613
Simple version bump. Release notes:

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
(cherry picked from commit 9d4bf6b155)
2017-06-30 08:43:21 +01:00
Peter Simons
9fe528222f bind: update to version 9.10.5-P2 to fix CVE-2017-3142 and CVE-2017-3143 2017-06-29 22:22:11 +02:00
Lancelot SIX
2e983f14f6 libgcrypt: 1.7.7 -> 1.7.8
See http://lists.gnu.org/archive/html/info-gnu/2017-06/msg00016.html
for release information

(cherry picked from commit 9a9294a970)
2017-06-29 11:53:40 -04:00
Eelco Dolstra
fc3f38d67f Forks::Super: Build on Hydra
(cherry picked from commit 6feedb4492)
2017-06-29 15:02:53 +02:00
Tim Steinbach
9e5a13f6f1 linux: 4.11.7 -> 4.11.8
(cherry picked from commit 37bc494949)
2017-06-29 08:33:15 -04:00
Tim Steinbach
a03777e74e linux: 4.9.34 -> 4.9.35
Also, remove XSA-216 patches, the fixes are now integrated upstream

(cherry picked from commit d1aff8d2e5)
2017-06-29 08:33:02 -04:00
Tim Steinbach
c88fa5b309 linux: 4.4.74 -> 4.4.75
(cherry picked from commit 6b35f22e28)
2017-06-29 08:31:45 -04:00
Tim Steinbach
94ed59f5c0 linux: 4.4.73 -> 4.4.74
(cherry picked from commit d2e199ca3c)
2017-06-29 08:31:14 -04:00
Rob Vermaas
26d750ebbe Make cron build. 2017-06-29 11:29:29 +00:00
Tim Steinbach
1201ddaf36 Merge pull request #26868 from michalpalka/xen-security-2017.06-backport-new
xen: patch for XSAs: 216, 217, 218, 219, 220, 221, 222, and 224 (release-17.03)
2017-06-28 22:44:43 -04:00
Will Dietz
55bc539b80 mendeley: ignore errors attempting to install link handler on startup
It's not critical functionality and AFAICT only fails in environments
that wouldn't benefit from "successfully" installing it anyway.

Fixes #24709
Fixes #24821

(cherry picked from commit 4f4ae214a3a46ba83f790d23c0e9df0bf9f04215)
2017-06-28 23:44:02 +01:00
Tim Steinbach
3a76840b2d docker: 17.03.1-ce -> 17.03.2-ce
(cherry picked from commit add90948bc)
2017-06-28 12:52:50 -04:00
Jörg Thalheim
a10cbbd591 suid-chroot: do not set suid bit during install
To be useful in nixos, it probably also requires a module to set up a hardening wrapper.

(cherry picked from commit 855c1bde42)
2017-06-28 16:01:32 +01:00
Eelco Dolstra
a2c7482319 systemd: Apply fix for CVE-2017-9445 2017-06-28 14:00:28 +02:00
Shea Levy
17568fbd2d Add ansible 2.3
(cherry picked from commit 551dcb6783)
2017-06-27 15:35:24 -04:00
Maximilian Bosch
f38559d781 geogebra: 5-0-361-0 -> 5-0-369-0
(cherry picked from commit f5665e9ab4)
2017-06-27 17:24:44 +02:00
Maximilian Bosch
39ca634620 geogebra: 5-0-355-0 -> 5-0-361-0
(cherry picked from commit 47e8665595)
2017-06-27 17:24:40 +02:00
Maximilian Bosch
8e4eb8970a geogebra: 5-0-350-0 -> 5-0-355-0 (#25324)
(cherry picked from commit b12f76ddd3)
2017-06-27 17:24:38 +02:00
Domen Kožar
412e55a193 hydra: restart daemons on config change
https://github.com/NixOS/hydra/pull/491
(cherry picked from commit 4dadb12a63)
Signed-off-by: Domen Kožar <domen@dev.si>
2017-06-27 17:09:42 +02:00
Jörg Thalheim
1b78b2d18d glusterfs: do not set setuid in install
related to #26600
2017-06-27 13:23:43 +02:00
Niklas Hambüchen
395bd92ed4 glusterfs: Upgrade to 3.10.2 2017-06-27 13:23:43 +02:00
Niklas Hambüchen
2982a657c9 glusterfs: Enable parallel building.
I checked for determinism with `nix-build --option build-repeat 10`.
2017-06-27 13:23:43 +02:00
Niklas Hambüchen
c061e5072d glusterfs: Make commands that gluster calls work. Fixes #25620.
Done by setting PATH and PYTHONPATH appropriately.

Adds the following patches:

* One that removes hardcodes to /sbin, /usr/bin, etc.
  from gluster, so that programs like `lvm` and `xfs_info` can be
  called at runtime; see https://bugzilla.redhat.com/show_bug.cgi?id=1450546.
* One that fixes unsubstituted autoconf macros in paths (a problem
  in the 3.10 release); see https://bugzilla.redhat.com/show_bug.cgi?id=1450588.
* One that removes uses of the `find_library()` Python function that does
  not behave as expected in Python < 3.6 (and would not behave correctly
  even on 3.6 in nixpkgs due to #25763);
  see https://bugzilla.redhat.com/show_bug.cgi?id=1450593.

I think that all of these patches should be upstreamed.

Also adds tests to check that none of the Python based utilities
throw import errors, calling `--help` or equivalent on them.
2017-06-27 13:23:43 +02:00
Niklas Hambüchen
fef914c794 glusterfs: Use github instead of download.gluster.org to obtain source.
This is because the source tarball available on
  https://download.gluster.org/pub/gluster/glusterfs/3.10/3.10.1/glusterfs-3.10.1.tar.gz
has different contents than the v3.10.1 tag;
for example, it lacks the file `xlators/features/ganesha/src/Makefile.am`,
which the tag has.
This is because GluserFS's release process removes some unused files.

This made impossible to apply patches written by or for upstream, as those
are written against what's in upstream's git.

As a nice side effect, we no longer have to hardcode the "3.10" in the
`3.10/${version}` part of the URL.
2017-06-27 13:23:43 +02:00
Niklas Hambüchen
8c0620faee glusterfs: Remove no longer needed subsitutions of DESTDIR.
They were made unnecessary in commit d07154b3bc, which added
`makeFlags = "DESTDIR=$(out)";`.
2017-06-27 13:23:43 +02:00
Volth
b2bf4d8327 mtr: do not do 'setcap' on installPhase, it would fail anyway
(cherry picked from commit 8fe525b6c7)
2017-06-26 19:31:15 +02:00
Franz Pletz
4fb8f6f7a5 lxc: 2.0.7 -> 2.0.8
(cherry picked from commit eb8c14751a)
2017-06-26 19:17:11 +02:00
Will Dietz
b00fb69ff8 at: Don't set fancy bits on install
(cherry picked from commit 0d92084f75)
2017-06-26 19:11:27 +02:00
Rob Vermaas
5cff2032dc Disable pyopenssl tests temporarily, due to hardcoded certificate that depend on a date before June 10-11 2017. Newest version of pyopenssl still has the same certificates as far as I could see. 2017-06-26 12:56:13 +00:00
Franz Pletz
17e9509d66 libcgroup: do not set suid bit in nix store
(cherry picked from commit b788956239)
2017-06-26 09:17:33 +02:00
Emmanuel Rosa
469fa436c7 thunderbird: 52.2.0 -> 52.2.1
(cherry picked from commit 994998e475)
2017-06-26 09:17:21 +02:00
Gabriel Ebner
55f2e7894b microcodeIntel: 20161104 -> 20170511
(cherry picked from commit 252e9ec84a)
2017-06-26 09:16:57 +02:00
Michał Pałka
96d840718b xen: patch for XSAs: 216, 217, 218, 219, 220, 221, 222, and 224
XSA-216 Issue Description:

> The block interface response structure has some discontiguous fields.
> Certain backends populate the structure fields of an otherwise
> uninitialized instance of this structure on their stacks, leaking
> data through the (internal or trailing) padding field.

More: https://xenbits.xen.org/xsa/advisory-216.html

XSA-217 Issue Description:

> Domains controlling other domains are permitted to map pages owned by
> the domain being controlled.  If the controlling domain unmaps such a
> page without flushing the TLB, and if soon after the domain being
> controlled transfers this page to another PV domain (via
> GNTTABOP_transfer or, indirectly, XENMEM_exchange), and that third
> domain uses the page as a page table, the controlling domain will have
> write access to a live page table until the applicable TLB entry is
> flushed or evicted.  Note that the domain being controlled is
> necessarily HVM, while the controlling domain is PV.

More: https://xenbits.xen.org/xsa/advisory-217.html

XSA-218 Issue Description:

> We have discovered two bugs in the code unmapping grant references.
>
> * When a grant had been mapped twice by a backend domain, and then
> unmapped by two concurrent unmap calls, the frontend may be informed
> that the page had no further mappings when the first call completed rather
> than when the second call completed.
>
> * A race triggerable by an unprivileged guest could cause a grant
> maptrack entry for grants to be "freed" twice.  The ultimate effect of
> this would be for maptrack entries for a single domain to be re-used.

More: https://xenbits.xen.org/xsa/advisory-218.html

XSA-219 Issue Description:

> When using shadow paging, writes to guest pagetables must be trapped and
> emulated, so the shadows can be suitably adjusted as well.
>
> When emulating the write, Xen maps the guests pagetable(s) to make the final
> adjustment and leave the guest's view of its state consistent.
>
> However, when mapping the frame, Xen drops the page reference before
> performing the write.  This is a race window where the underlying frame can
> change ownership.
>
> One possible attack scenario is for the frame to change ownership and to be
> inserted into a PV guest's pagetables.  At that point, the emulated write will
> be an unaudited modification to the PV pagetables whose value is under guest
> control.

More: https://xenbits.xen.org/xsa/advisory-219.html

XSA-220 Issue Description:

> Memory Protection Extensions (MPX) and Protection Key (PKU) are features in
> newer processors, whose state is intended to be per-thread and context
> switched along with all other XSAVE state.
>
> Xen's vCPU context switch code would save and restore the state only
> if the guest had set the relevant XSTATE enable bits.  However,
> surprisingly, the use of these features is not dependent (PKU) or may
> not be dependent (MPX) on having the relevant XSTATE bits enabled.
>
> VMs which use MPX or PKU, and context switch the state manually rather
> than via XSAVE, will have the state leak between vCPUs (possibly,
> between vCPUs in different guests).  This in turn corrupts state in
> the destination vCPU, and hence may lead to weakened protections
>
> Experimentally, MPX appears not to make any interaction with BND*
> state if BNDCFGS.EN is set but XCR0.BND{CSR,REGS} are clear.  However,
> the SDM is not clear in this case; therefore MPX is included in this
> advisory as a precaution.

More: https://xenbits.xen.org/xsa/advisory-220.html

XSA-221 Issue Description:

> When polling event channels, in general arbitrary port numbers can be
> specified.  Specifically, there is no requirement that a polled event
> channel ports has ever been created.  When the code was generalised
> from an earlier implementation, introducing some intermediate
> pointers, a check should have been made that these intermediate
> pointers are non-NULL.  However, that check was omitted.

More: https://xenbits.xen.org/xsa/advisory-221.html

XSA-222 Issue Description:

> Certain actions require removing pages from a guest's P2M
> (Physical-to-Machine) mapping.  When large pages are in use to map
> guest pages in the 2nd-stage page tables, such a removal operation may
> incur a memory allocation (to replace a large mapping with individual
> smaller ones).  If this allocation fails, these errors are ignored by
> the callers, which would then continue and (for example) free the
> referenced page for reuse.  This leaves the guest with a mapping to a
> page it shouldn't have access to.
>
> The allocation involved comes from a separate pool of memory created
> when the domain is created; under normal operating conditions it never
> fails, but a malicious guest may be able to engineer situations where
> this pool is exhausted.

More: https://xenbits.xen.org/xsa/advisory-222.html

XSA-224 Issue Description:

> We have discovered a number of bugs in the code mapping and unmapping
> grant references.
>
> * If a grant is mapped with both the GNTMAP_device_map and
> GNTMAP_host_map flags, but unmapped only with host_map, the device_map
> portion remains but the page reference counts are lowered as though it
> had been removed. This bug can be leveraged cause a page's reference
> counts and type counts to fall to zero while retaining writeable
> mappings to the page.
>
> * Under some specific conditions, if a grant is mapped with both the
> GNTMAP_device_map and GNTMAP_host_map flags, the operation may not
> grab sufficient type counts.  When the grant is then unmapped, the
> type count will be erroneously reduced.  This bug can be leveraged
> cause a page's reference counts and type counts to fall to zero while
> retaining writeable mappings to the page.
>
> * When a grant reference is given to an MMIO region (as opposed to a
> normal guest page), if the grant is mapped with only the
> GNTMAP_device_map flag set, a mapping is created at host_addr anyway.
> This does *not* cause reference counts to change, but there will be no
> record of this mapping, so it will not be considered when reporting
> whether the grant is still in use.

More: https://xenbits.xen.org/xsa/advisory-224.html

(cherry picked and adapted from commit 80e0cda7ff)
2017-06-26 07:04:45 +00:00
Franz Pletz
5b54e99cea glibc: fix i686 build
(cherry picked from commit 7cfd1c8c1b)
2017-06-26 02:26:32 +02:00
Bjørn Forsman
d0ad6a7651 nixos/bcache: add services.udev.packages = [ bcache-tools ]
Adds /dev/disk/by-{id,label}/* symlinks for bcache device nodes, in the
final rootfs.

Symlinks will only be created for bcache devices that contain
filesystems. So if you have a blank bcache device or run LVM on top of
bcache you will not get this kind of symlink.

(cherry picked from commit 5b48368386)
2017-06-25 19:53:39 +02:00
Bjørn Forsman
b71f5e311b nixos/bcache: /bin/sh -> ${bash}/bin/sh
Or else `services.udev.packages = [ bcache-tools ]` cannot be used.

To not break bcache in the initrd I'm modifying this in stage-1.nix:

  -  --replace /bin/sh ${extraUtils}/bin/sh
  +  --replace ${bash}/bin/sh ${extraUtils}/bin/sh

Reasoning behind that change:

* If not modifying the /bin/sh pattern in any way, it will also match
  ${bash}/bin/sh, creating a broken path like
  /nix/store/HASH-bash/nix/store/HASH-bash/bin/sh in the udev rule file.

* The addition of /bin/sh was done in 775f381a9e
  ("stage-1: add bcache support"). It seems somewhat plausible that
  no new users have appeared since then and we can take this opportunity
  to back out of this change without much fear of regressions.

  If there _are_ regressions, they should be in the form of build time
  errors, not runtime (boot), due to how the udev rule output is checked
  for invalid path references. So low risk, IMHO.

* An alternative approach could be to copy the /bin/sh substitute rule
  over to the non-initrd udev rules implementation in NixOS, but I think
  this way is better:
  - The rules file comes with a working path out of the box.
  - We can use more precise pattern matching when modifying the udev
    rules for the initrd.

(cherry picked from commit 581226cfb4)
2017-06-25 19:53:39 +02:00
Bjørn Forsman
37ec462019 bcache-tools: add name to the source store path
So that

 $ nix-build -A bcache-tools.src

gives

 /nix/store/HASH-bcache-tools-1.0.7.tar.gz

instead of

 /nix/store/HASH-v1.0.7.tar.gz

(cherry picked from commit f12b0a2179)
2017-06-25 19:53:39 +02:00
Tim Steinbach
c1ad03b460 Revert "linux: patch CVE-2017-1000364 (stack clash)"
This reverts commit 6c026fe3d0.
2017-06-25 09:19:07 -04:00
Tim Steinbach
280f0db6a0 Revert "Revert "linux: 4.9.33 -> 4.9.34""
This reverts commit 0ee624c208.
2017-06-25 09:18:56 -04:00
Tim Steinbach
0ee624c208 Revert "linux: 4.9.33 -> 4.9.34"
This reverts commit e74d2b42c8.
2017-06-25 09:02:11 -04:00