[rpms/asterisk] rawhide: Reenable system-wide iLBC

[rpms/asterisk] rawhide: Reenable system-wide iLBC

[Peter Lemenkov]

            A new commit has been pushed.

            Repo   : rpms/asterisk
            Branch : rawhide
            Commit : 011a28801acf084deea525566b40dab980b258b6
            Author : Peter Lemenkov <lemenkov@gmail.com>
            Date   : 2026-09-01T14:16:51+02:00
            Stats  : +29/-19 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/asterisk/c/011a28801acf084deea525566b40dab980b258b6?branch=rawhide

            Log:
            Reenable system-wide iLBC

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>

---
diff --git a/asterisk-18.12.1-ilbc_macros.patch b/asterisk-18.12.1-ilbc_macros.patch
index 01946be..1f445d2 100644
--- a/asterisk-18.12.1-ilbc_macros.patch
+++ b/asterisk-18.12.1-ilbc_macros.patch
@@ -3,6 +3,12 @@ From: =?UTF-8?q?Michal=20Josef=20=C5=A0pa=C4=8Dek?= <mspacek@redhat.com>
 Date: Wed, 15 Jun 2022 17:40:46 +0200
 Subject: [PATCH] handle ilbc v3 errors
 
+libilbc 3.x removed the RFC 3951 compatibility function names (initDecode,
+initEncode, iLBC_decode, iLBC_encode). Map them to the WebRtcIlbcfix_* symbols
+the library exposes, and drop the "libilbc < 3" configure restriction, so
+codec_ilbc is built against the system libilbc even when it is version 3.x.
+
+Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 
 diff --git a/codecs/codec_ilbc.c b/codecs/codec_ilbc.c
 index 536d68026e..c75cbb7a48 100644
@@ -20,3 +26,16 @@ index 536d68026e..c75cbb7a48 100644
  #else
  #include "ilbc/iLBC_encode.h"
  #include "ilbc/iLBC_decode.h"
+diff --git a/configure.ac b/configure.ac
+index a25e99781d..195d28b233 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1765,7 +1765,7 @@ if test "${USE_ILBC}" != "no"; then
+       ILBC_INTERNAL="no"
+    fi
+    if test "${ILBC_SYSTEM}" = "yes"; then
+-      AST_PKG_CONFIG_CHECK(ILBC, libilbc < 3)
++      AST_PKG_CONFIG_CHECK(ILBC, libilbc)
+       if test "$PBX_ILBC" = "1"; then
+ 	 ILBC_INTERNAL="no"
+       fi

diff --git a/asterisk-23.5.0-Bundled-pjproject-do-not-discard-the-ambient-CFLAGS.patch b/asterisk-23.5.0-Bundled-pjproject-do-not-discard-the-ambient-CFLAGS.patch
index 65e8e36..5d17862 100644
--- a/asterisk-23.5.0-Bundled-pjproject-do-not-discard-the-ambient-CFLAGS.patch
+++ b/asterisk-23.5.0-Bundled-pjproject-do-not-discard-the-ambient-CFLAGS.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov@gmail.com>
 Date: Mon, 31 Aug 2026 15:54:23 +0200
-Subject: [PATCH] Bundled pjproject: do not discard the ambient CFLAGS
+Subject: [PATCH] Bundled pjproject: Do not discard the ambient CFLAGS
 
 Commit f82393da0dbf125bd96e3c4a0dc080f88d6a90e4 ("Bundled pjproject: Make it
 easier to override options in config_site.h") added
@@ -13,24 +13,13 @@ bundled pjproject inherited the exported CFLAGS from the environment. Passing
 it explicitly overrides that, and PJPROJECT_CFLAGS contains only the options
 this file adds (-DPJ_HAS_LINUX_EPOLL=1), so every distribution flag is lost.
 
-LDFLAGS is still inherited, and on distributions whose toolchain links PIE by
-default it carries the hardened-link specs. The result is a non-PIC compile
-combined with a PIE link:
-
-    gcc -o conftest -DPJ_HAS_LINUX_EPOLL=1 -m64 -Wl,... \
-        -specs=/usr/lib/rpm/redhat/redhat-hardened-ld ... conftest.c
-    ld.bfd: relocation R_X86_64_32 against `.rodata' can not be used when
-            making a PIE object; recompile with -fPIE
-
-autoconf cannot then run the test binary and reports the misleading
-
-    aconfigure: error: cannot run C compiled programs.
-
-which aborts the build before pjproject is configured.
-
 Appending to the ambient CFLAGS rather than replacing them keeps the new
 PJPROJECT_CFLAGS override working while restoring inheritance.
 
+Resolves: #2132
+
+Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
+
 diff --git a/third-party/pjproject/Makefile.rules b/third-party/pjproject/Makefile.rules
 index f6790bd216..d09da39817 100644
 --- a/third-party/pjproject/Makefile.rules

diff --git a/asterisk.spec b/asterisk.spec
index 68ea834..5f7e2b6 100644
--- a/asterisk.spec
+++ b/asterisk.spec
@@ -46,7 +46,7 @@
 %endif
 %global           meetme     0
 %global           ooh323     0
-%if 0%{?fedora} > 37 || 0%{?rhel} > 7
+%if 0%{?rhel} > 7
 # Do nothing. We want this to be undefined.
 %else
 %global           sysilbc    1
@@ -57,7 +57,7 @@
 Summary:          The Open Source PBX
 Name:             asterisk
 Version:          23.5.0
-Release:          %{?_rc||?_beta:0.}1%{?_rc:.rc%{_rc}}%{?_beta:.beta%{_beta}}%{?dist}
+Release:          %{?_rc||?_beta:0.}2%{?_rc:.rc%{_rc}}%{?_beta:.beta%{_beta}}%{?dist}
 # Automatically converted from old format: GPLv2 - review is highly recommended.
 License:          GPL-2.0-only
 URL:              http://www.asterisk.org/
@@ -174,7 +174,6 @@ BuildRequires:    SDL_image-devel
 BuildRequires:    libedit-devel
 
 # codec_ilbc
-# Fedora 37+ ships ilbc v3 which asterisk does not (yet?) support
 %if 0%{?sysilbc}
 BuildRequires:    ilbc-devel
 %endif
@@ -1651,6 +1650,9 @@ fi
 %endif
 
 %changelog
+* Tue Sep  1 2026 Peter Lemenkov <lemenkov@gmail.com> - 23.5.0-2
+- Reenable system-wide iLBC
+
 * Mon Aug 31 2026 Peter Lemenkov <lemenkov@gmail.com> - 23.5.0-1
 - update to 23.5.0