Unverified Commit eab968e4 authored by Robert Scott's avatar Robert Scott Committed by GitHub
Browse files

Merge pull request #227039 from yorickvP/bump-asterisk 

asterisk: drop 16, 19, bump 18.16.0 -> 18.17.1, 20.1.0 -> 20.2.1
parents b2d51541 44a4afba

nixos/doc/manual/release-notes/rl-2305.section.md

+2 −0
Original line number Diff line number Diff line
@@ -229,6 +229,8 @@ In addition to numerous new and upgraded packages, this release has the followin 


- To enable the HTTP3 (QUIC) protocol for a nginx virtual host, set the `quic` attribute on it to true, e.g. `services.nginx.virtualHosts.<name>.quic = true;`.



- The default Asterisk package was changed to v20 from v19. Asterisk versions 16 and 19 have been dropped due to being EOL. You may need to update /var/lib/asterisk to match the template files in `${asterisk-20}/var/lib/asterisk`.



- conntrack helper autodetection has been removed from kernels 6.0 and up upstream, and an assertion was added to ensure things don't silently stop working. Migrate your configuration to assign helpers explicitly or use an older LTS kernel branch as a temporary workaround.



- The `services.pipewire.config` options have been removed, as they have basically never worked correctly. All behavior defined by the default configuration can be overridden with drop-in files as necessary - see [below](#sec-release-23.05-migration-pipewire) for details.

pkgs/servers/asterisk/default.nix

+34 −28
Original line number Diff line number Diff line
@@ -37,24 +37,20 @@ 


let

  # remove when upgrading to pjsip >2.13

  pjsip_patches = [

  pjsip_2_13_patches = [

    (fetchpatch {

      name = "0152-CVE-2022-39269.patch";

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

      sha256 = "sha256-bKE/MrRAqN1FqD2ubhxIOOf5MgvZluHHeVXPjbR12iQ=";

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

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

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

    })

    (fetchpatch {

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

      url = "https://raw.githubusercontent.com/NixOS/nixpkgs/ca2b44568eb0ffbd0b5a22eb70feb6dbdcda8e9c/pkgs/applications/networking/pjsip/1.12.1-CVE-2022-23537.patch";

      sha256 = "sha256-KNSnHt0/o1qJk4r2z5bxbYxKAa7WBtzGOhRXkru3VK4=";

    })

    (fetchpatch {

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

      url = "https://raw.githubusercontent.com/NixOS/nixpkgs/ca2b44568eb0ffbd0b5a22eb70feb6dbdcda8e9c/pkgs/applications/networking/pjsip/1.12.1-CVE-2022-23547.patch";

      sha256 = "sha256-0iEr/Z4UQpWsTXYWVYzWWk7MQDOFnTQ1BBYpynGLTVQ=";

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

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

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

    })

  ];

  common = { version, sha256, externals }: stdenv.mkDerivation {



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

    inherit version;

    pname = "asterisk"

      + lib.optionalString ldapSupport "-ldap";
@@ -159,9 +155,12 @@ let 
    };

  };



  pjproject_2_12_1 = fetchurl {

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

    hash = "sha256-DiNH1hB5ZheYzyUjFyk1EtlsMJlgjf+QRVKjEk+hNjc=";

  pjproject_2_13 = fetchurl

    {

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

      hash = "sha256-Zj93PUAct13KVR5taOWEbQdKq76wicaBTNHpHC0rICY=";

    } // {

    pjsip_patches = pjsip_2_13_patches;

  };



  mp3-202 = fetchsvn {
@@ -180,10 +179,15 @@ let 


  # auto-generated by update.py

  versions = lib.mapAttrs

    (_: { version, sha256 }: common {

    (_: { version, sha256 }:

      let

        pjsip = pjproject_2_13;

      in

      common {

        inherit version sha256;

        inherit (pjsip) pjsip_patches;

        externals = {

        "externals_cache/pjproject-2.12.1.tar.bz2" = pjproject_2_12_1;

          "externals_cache/${pjsip.name}" = pjsip;

          "addons/mp3" = mp3-202;

        };

      })
@@ -197,18 +201,20 @@ let 


in

{

  # Supported releases (as of 2022-04-05).

  # Supported releases (as of 2023-04-19).

  # v16 and v19 have been dropped because they go EOL before the NixOS 23.11 release.

  # Source: https://wiki.asterisk.org/wiki/display/AST/Asterisk+Versions

  # Exact version can be found at https://www.asterisk.org/downloads/asterisk/all-asterisk-versions/

  #

  # Series  Type       Rel. Date   Sec. Fixes  EOL

  # 16.x    LTS        2018-10-09  2022-10-09  2023-10-09

  # 16.x    LTS        2018-10-09  2022-10-09  2023-10-09 (dropped)

  # 18.x    LTS        2020-10-20  2024-10-20  2025-10-20

  # 19.x    Standard   2021-11-02  2022-11-02  2023-11-02

  # 19.x    Standard   2021-11-02  2022-11-02  2023-11-02 (dropped)

  # 20.x    LTS        2022-11-02  2026-10-19  2027-10-19

  # 21.x    Standard   2023-10-18  2025-10-18  2026-10-18 (unreleased)

  asterisk-lts = versions.asterisk_18;

  asterisk-stable = versions.asterisk_19;

  asterisk = versions.asterisk_19.overrideAttrs (o: {

  asterisk-stable = versions.asterisk_20;

  asterisk = versions.asterisk_20.overrideAttrs (o: {

    passthru = (o.passthru or { }) // { inherit updateScript; };

  });

pkgs/servers/asterisk/versions.json

+4 −4
Original line number Diff line number Diff line
@@ -4,15 +4,15 @@ 
    "version": "16.30.0"

  },

  "asterisk_18": {

    "sha256": "2d280794ae7505ed3dfc58b3190774cb491aa74c339fbde1a11740e6be79b466",

    "version": "18.16.0"

    "sha256": "66f0e55d84f9e5bf4e79a56255d35a034448acce00d219c3bf4930b1ebb0e88e",

    "version": "18.17.1"

  },

  "asterisk_19": {

    "sha256": "f0c56d1f8e39e0427455edfe25d24ff088c756bdc32dd1278c9f7a320815cbaa",

    "version": "19.8.0"

  },

  "asterisk_20": {

    "sha256": "4364dc762652e2fd4d3e7dc8428c83550ebae090b8a0e9d4820583e081778883",

    "version": "20.1.0"

    "sha256": "df12e47000fbac42bb780bb06172aa8bb8ac26faf77cc9f95184695b0cec69c3",

    "version": "20.2.1"

  }

}

pkgs/top-level/aliases.nix

+2 −0
Original line number Diff line number Diff line
@@ -98,7 +98,9 @@ mapAliases ({ 
  asls = throw "asls has been removed: abandoned by upstream"; # Added 2023-03-16

  asterisk_13 = throw "asterisk_13: Asterisk 13 is end of life and has been removed"; # Added 2022-04-06

  asterisk_15 = throw "asterisk_15: Asterisk 15 is end of life and has been removed"; # Added 2020-10-07

  asterisk_16 = throw "asterisk_16: Asterisk 16 is end of life and has been removed"; # Added 2023-04-19

  asterisk_17 = throw "asterisk_17: Asterisk 17 is end of life and has been removed"; # Added 2022-04-06

  asterisk_19 = throw "asterisk_19: Asterisk 19 is end of life and has been removed"; # Added 2023-04-19

  at_spi2_atk = throw "'at_spi2_atk' has been renamed to/replaced by 'at-spi2-atk'"; # Converted to throw 2022-02-22

  at_spi2_core = throw "'at_spi2_core' has been renamed to/replaced by 'at-spi2-core'"; # Converted to throw 2022-02-22

  aucdtect = throw "aucdtect: Upstream no longer provides download urls"; # Added 2020-12-26

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -24875,7 +24875,7 @@ with pkgs; 














  inherit (callPackages ../servers/asterisk { })















    asterisk asterisk-stable asterisk-lts













    asterisk_16 asterisk_18 asterisk_19 asterisk_20;













    asterisk_18 asterisk_20;





























  asterisk-module-sccp = callPackage ../servers/asterisk/sccp { };