Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

gettext: apply patch for CVE 2018-18751 (backport 18.09) #59000

Merged
merged 1 commit into from Apr 9, 2019
Merged

gettext: apply patch for CVE 2018-18751 (backport 18.09) #59000

merged 1 commit into from Apr 9, 2019

Conversation

ctheune
Copy link
Contributor

@ctheune ctheune commented Apr 5, 2019 •
edited

Re-include an older automake (1.15) because that's explicitly depended upon.

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ctheune ctheune changed the title gettext: apply patch for CVE 2018-18751 gettext: apply patch for CVE 2018-18751 (backport 18.09) Apr 5, 2019
@ctheune ctheune mentioned this pull request Apr 5, 2019
Merged
10 tasks
@7c6f434c
Copy link
Member

7c6f434c commented Apr 5, 2019

@grahamc what's going on? is that the all-packages.nix failure mode we wondered about?

@ctheune
Copy link
Contributor Author

ctheune commented Apr 5, 2019

@7c6f434c please note that this is the backport PR for #58997. We found a bootstrapping issue there and I'll update this PR as soon as the main one is cleaned up.

@7c6f434c
Copy link
Member

7c6f434c commented Apr 5, 2019

I know it is a backport, thanks for cross-linking.

@ctheune
Copy link
Contributor Author

ctheune commented Apr 5, 2019

Just wanted to make sure you don't merge this as this really isn't ready as we found out over there :)

@grahamc
Copy link
Member

grahamc commented Apr 5, 2019 via email

@grahamc
Copy link
Member

grahamc commented Apr 5, 2019

these extra pings are because of packages being defined in all-packages.nix, instead of their own file:

gap-libgap-compatible

  gap-libgap-compatible = let
    version = "4r8p6";
    pkgVer = "2016_11_12-14_25";
  in
    (gap.override { keepAllPackages = false; }).overrideAttrs (oldAttrs: {
      name = "libgap-${oldAttrs.pname}-${version}";
      src = fetchurl {
        url = "https://www.gap-system.org/pub/gap/gap48/tar.bz2/gap${version}_${pkgVer}.tar.bz2";
        sha256 = "19n2p1mdg33s2x9rs51iak7rgndc1cwr56jyqnah0g1ydgg1yh6b";
      };
      patches = (oldAttrs.patches or []) ++ [
        # don't install any packages by default (needed for interop with libgap, probably obsolete  with 4r10
        (fetchpatch {
          url = "https://git.sagemath.org/sage.git/plain/build/pkgs/gap/patches/nodefaultpackages.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
          sha256 = "1xwj766m3axrxbkyx13hy3q8s2wkqxy3m6mgpwq3c3n4vk3v416v";
        })
      ];
  });
  libgap = callPackage ../development/libraries/libgap { };

portaudio2014

  portaudio = callPackage ../development/libraries/portaudio {
    inherit (darwin.apple_sdk.frameworks) AudioToolbox AudioUnit CoreAudio CoreServices Carbon;
  };

  portaudio2014 = portaudio.overrideAttrs (oldAttrs: {
    src = fetchurl {
      url = http://www.portaudio.com/archives/pa_stable_v19_20140130.tgz;
      sha256 = "0mwddk4qzybaf85wqfhxqlf0c5im9il8z03rd4n127k8y2jj9q4g";
    };
  });

sqlite-replication

  sqlite-replication = sqlite.overrideAttrs (oldAttrs: rec {
    name = "sqlite-${version}";
    version = "3.24.0+replication3";
    src = pkgs.fetchFromGitHub {
      owner = "CanonicalLtd";
      repo = "sqlite";
      rev = "version-${version}";
      sha256 = "19557b7aick1pxk0gw013cf5jy42i7539qn1ziza8dzy16a6zs8b";
    };
    nativeBuildInputs = [ pkgs.tcl ];
    configureFlags = oldAttrs.configureFlags ++ [
      "--enable-replication"
      "--disable-amalgamation"
      "--disable-tcl"
    ];
    preConfigure = ''
      echo "D 2018-08-01T13:22:18" > manifest
      echo -n "c94dbda1a570c1ab180e7694afd3cc7116268c06" > manifest.uuid
    '';
  });

libyamlcpp_0_3

  libyamlcpp = callPackage ../development/libraries/libyaml-cpp { };

  libyamlcpp_0_3 = pkgs.libyamlcpp.overrideAttrs (oldAttrs: rec {
    src = pkgs.fetchurl {
      url = "https://github.com/jbeder/yaml-cpp/archive/release-0.3.0.tar.gz";
      sha256 = "12aszqw6svwlnb6nzhsbqhz3c7vnd5ahd0k6xlj05w8lm83hx3db";
      };
  });

By all accounts, these packages should have pinged: the file they are defined in was changed, and their output paths were changed. The solution is to move these out of all-packages.nix and in to their own .nix files.

@andir
Copy link
Member

andir commented Apr 5, 2019 •
edited

@grahamc I think those pings arrived when the PR was rebased onto staging and for a while contained all the staging changes + the gettext changes. nvm, you seem to be right

@ctheune
gettext: apply patch for CVE 2018-18751
dcebc69 
Re-include an older automake (1.15) because that's explicitly depended upon.
@ctheune ctheune force-pushed the gettext-security-update-18.09 branch from 37fb4d1 to dcebc69 Compare April 5, 2019 17:08
@ctheune
Copy link
Contributor Author

ctheune commented Apr 5, 2019

Ok, as the patch in the master PR seems fine, I've updated the backport patch, too.

@andir andir merged commit 9f76c64 into NixOS:staging-18.09 Apr 9, 2019
@ctheune ctheune deleted the gettext-security-update-18.09 branch April 9, 2019 12:07
@veprbl veprbl mentioned this pull request Apr 14, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lovek323 lovek323 Awaiting requested review from lovek323

@zimbatm zimbatm Awaiting requested review from zimbatm

@vrthra vrthra Awaiting requested review from vrthra

@andir andir Awaiting requested review from andir

@edolstra edolstra Awaiting requested review from edolstra

@7c6f434c 7c6f434c Awaiting requested review from 7c6f434c

Assignees
No one assigned
Labels
8.has: package (new) 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-darwin-stdenv 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+ 10.rebuild-linux-stdenv
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@ctheune @7c6f434c @grahamc @andir @GrahamcOfBorg