diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-05-26 21:33:39 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-26 21:33:39 +0300 |
| commit | e122f584b24d18f03249919fab770640a03e7fe0 (patch) | |
| tree | d20303556f403263e637c1e11252a084ae1219bd | |
| parent | Merge pull request #234274 from NixOS/backport-234191-to-release-23.05 (diff) | |
| parent | gpac: 2.2.0 -> 2.2.1 (diff) | |
| download | nixpkgs-e122f584b24d18f03249919fab770640a03e7fe0.tar.gz | |
Merge pull request #234271 from NixOS/backport-234203-to-release-23.05
[Backport release-23.05] gpac: 2.2.0 -> 2.2.1
| -rw-r--r-- | pkgs/applications/video/gpac/default.nix | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/pkgs/applications/video/gpac/default.nix b/pkgs/applications/video/gpac/default.nix index afc97cd7e1a9..b573fa3a43f6 100644 --- a/pkgs/applications/video/gpac/default.nix +++ b/pkgs/applications/video/gpac/default.nix @@ -1,21 +1,36 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, zlib }: stdenv.mkDerivation rec { - version = "2.2.0"; + version = "2.2.1"; pname = "gpac"; src = fetchFromGitHub { owner = "gpac"; repo = "gpac"; rev = "v${version}"; - sha256 = "sha256-m2qXTXLGgAyU9y6GEk4Hp/7Al57IPRSqImJatIcwswQ="; + hash = "sha256-VjA1VFMsYUJ8uJqhYgjXYtqlGWSJHr16Ck3b5stuZWw="; }; patches = [ (fetchpatch { - name = "CVE-2023-0358.patch"; - url = "https://github.com/gpac/gpac/commit/9971fb125cf91cefd081a080c417b90bbe4a467b.patch"; - sha256 = "sha256-0PDQXahbJCOo1JJAC0T0N1u2mqmwAkdm87wXMJnBicM="; + name = "CVE-2023-2837.patch"; + url = "https://github.com/gpac/gpac/commit/6f28c4cd607d83ce381f9b4a9f8101ca1e79c611.patch"; + hash = "sha256-HA6qMungIoh1fz1R3zUvV1Ahoa2pp861JRzYY/NNDQI="; + }) + (fetchpatch { + name = "CVE-2023-2838.patch"; + url = "https://github.com/gpac/gpac/commit/c88df2e202efad214c25b4e586f243b2038779ba.patch"; + hash = "sha256-gIISG7pz01iVoWqlho2BL27ki87i3pGkug2Z+KKn+xs="; + }) + (fetchpatch { + name = "CVE-2023-2839.patch"; + url = "https://github.com/gpac/gpac/commit/047f96fb39e6bf70cb9f344093f5886e51dce0ac.patch"; + hash = "sha256-i+/iFrWJ+Djc8xYtIOYvlZ98fYUdJooqUz9y/uhusL4="; + }) + (fetchpatch { + name = "CVE-2023-2840.patch"; + url = "https://github.com/gpac/gpac/commit/ba59206b3225f0e8e95a27eff41cb1c49ddf9a37.patch"; + hash = "sha256-mwO9Qeeufq0wa57lO+LgWGjrN3CHMYK+xr2ZBalKBQo="; }) ]; |