diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-12-01 08:27:31 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-12-01 08:27:31 +0100 |
| commit | da3679c1600d4657a3175eb7cfff3f6a346b03f3 (patch) | |
| tree | e139ac5ed1d5e0ce6a6026d4cfc29e0be425ae85 /pkgs/development/libraries/libsoup | |
| parent | 5cc70518bf117fbd68ae2671a9609c3f94a38247 (diff) | |
| download | nixlib-da3679c1600d4657a3175eb7cfff3f6a346b03f3.tar nixlib-da3679c1600d4657a3175eb7cfff3f6a346b03f3.tar.gz nixlib-da3679c1600d4657a3175eb7cfff3f6a346b03f3.tar.bz2 nixlib-da3679c1600d4657a3175eb7cfff3f6a346b03f3.tar.lz nixlib-da3679c1600d4657a3175eb7cfff3f6a346b03f3.tar.xz nixlib-da3679c1600d4657a3175eb7cfff3f6a346b03f3.tar.zst nixlib-da3679c1600d4657a3175eb7cfff3f6a346b03f3.zip | |
libsoup: maintenance 2.60.0 -> 2.60.2 + patch
Diffstat (limited to 'pkgs/development/libraries/libsoup')
| -rw-r--r-- | pkgs/development/libraries/libsoup/default.nix | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index cdf24c79e5ef..e8d48bf668b3 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchurl, glib, libxml2, pkgconfig +{ stdenv, fetchurl, fetchpatch, glib, libxml2, pkgconfig , gnomeSupport ? true, libgnome_keyring3, sqlite, glib_networking, gobjectIntrospection , valaSupport ? true, vala_0_38 , libintlOrEmpty , intltool, python }: let majorVersion = "2.60"; - version = "${majorVersion}.0"; + version = "${majorVersion}.2"; in stdenv.mkDerivation { name = "libsoup-${version}"; src = fetchurl { url = "mirror://gnome/sources/libsoup/${majorVersion}/libsoup-${version}.tar.xz"; - sha256 = "b324edbecda0884143c0853b4a2bd5bd37fb3761f12f293c621ff34b9acdc84c"; + sha256 = "7263cfe18872e2e652c196f5667e514616d9c97c861dfca82a65a55f45f0da01"; }; prePatch = '' @@ -22,6 +22,15 @@ stdenv.mkDerivation { substituteInPlace libsoup/Makefile.in --replace "\$(DESTDIR)\$(vapidir)" "\$(DESTDIR)\$(girdir)/../vala/vapi" ''; + patches = [ + # remove for >= 2.60.3 + (fetchpatch { + name = "buffer-overflow.patch"; # https://bugzilla.gnome.org/show_bug.cgi?id=788037 + url = "https://git.gnome.org/browse/libsoup/patch/?id=b79689833ba"; + sha256 = "1azbk540mbm4c6ip54ixbg9d6w7nkls9y81fzm3csq9a5786r3d3"; + }) + ]; + outputs = [ "out" "dev" ]; buildInputs = libintlOrEmpty ++ [ intltool python sqlite ] |