Unverified Commit 5dda5f2b authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #274484 from LeSuisse/asterisk-18.20.1-20.5.1 

asterisk_18: 18.17.1 -> 18.20.1, asterisk_20: 20.2.1 -> 20.5.1
parents 0f10e168 1137e416

pkgs/servers/asterisk/default.nix

+5 −24
Original line number Diff line number Diff line
@@ -36,25 +36,6 @@ 
}:



let

  # remove when upgrading to pjsip >2.13

  pjsip_2_13_patches = [

    (fetchpatch {

      name = "CVE-2022-23537.patch";

      url = "https://github.com/pjsip/pjproject/commit/d8440f4d711a654b511f50f79c0445b26f9dd1e1.patch";

      sha256 = "sha256-7ueQCHIiJ7MLaWtR4+GmBc/oKaP+jmEajVnEYqiwLRA=";

    })

    (fetchpatch {

      name = "CVE-2022-23547.patch";

      url = "https://github.com/pjsip/pjproject/commit/bc4812d31a67d5e2f973fbfaf950d6118226cf36.patch";

      sha256 = "sha256-bpc8e8VAQpfyl5PX96G++6fzkFpw3Or1PJKNPKl7N5k=";

    })

    (fetchpatch {

      name = "CVE-2023-27585.patch";

      url = "https://github.com/pjsip/pjproject/commit/d1c5e4da5bae7f220bc30719888bb389c905c0c5.patch";

      hash = "sha256-+yyKKTKG2FnfyLWnc4S80vYtDzmiu9yRmuqb5eIulPg=";

    })

  ];



  common = { version, sha256, externals, pjsip_patches ? [ ] }: stdenv.mkDerivation {

    inherit version;

    pname = "asterisk"
@@ -161,12 +142,12 @@ let 
    };

  };



  pjproject_2_13 = fetchurl

  pjproject_2_13_1 = fetchurl

    {

      url = "https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/2.13/pjproject-2.13.tar.bz2";

      hash = "sha256-Zj93PUAct13KVR5taOWEbQdKq76wicaBTNHpHC0rICY=";

      url = "https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/2.13.1/pjproject-2.13.1.tar.bz2";

      hash = "sha256-cOBRvO+B9fGt4UVYAHQQwBsc2cUF7Pu1GRsjAF7BE1g=";

    } // {

    pjsip_patches = pjsip_2_13_patches;

    pjsip_patches = [ ];

  };



  mp3-202 = fetchsvn {
@@ -187,7 +168,7 @@ let 
  versions = lib.mapAttrs

    (_: { version, sha256 }:

      let

        pjsip = pjproject_2_13;

        pjsip = pjproject_2_13_1;

      in

      common {

        inherit version sha256;

pkgs/servers/asterisk/versions.json

+8 −12
Original line number Diff line number Diff line 
{

  "asterisk_16": {

    "sha256": "f8448e8784df7fac019e459bf7c82529d80afe64ae97d73d40e6aa0e4fb39724",

    "version": "16.30.0"

  },

  "asterisk_18": {

    "sha256": "66f0e55d84f9e5bf4e79a56255d35a034448acce00d219c3bf4930b1ebb0e88e",

    "version": "18.17.1"

  },

  "asterisk_19": {

    "sha256": "f0c56d1f8e39e0427455edfe25d24ff088c756bdc32dd1278c9f7a320815cbaa",

    "version": "19.8.0"

    "sha256": "ad7d01f58e5c5266e5b23cc385e6a3d32a656b93c1d4b4fb0082f3300012bd02",

    "version": "18.20.1"

  },

  "asterisk_20": {

    "sha256": "df12e47000fbac42bb780bb06172aa8bb8ac26faf77cc9f95184695b0cec69c3",

    "version": "20.2.1"

    "sha256": "7d128f2a164e36fae4875058120ff026e7cd73f7701429fee4fa293f4fba4336",

    "version": "20.5.1"

  },

  "asterisk_21": {

    "sha256": "8e7db886b70e808ade38ad060ccbbb49353031e4c2fa6dc4435bfbd79f082956",

    "version": "21.0.1"

  }

}