commit 095ce1e244ebe3ce8ec9508cc5af040da2b924ff
Author: Jacek Konieczny <[email protected]>
Date: Tue Jun 12 11:12:03 2018 +0200
Version: 15.4.1
Includes security fixes:
http://downloads.asterisk.org/pub/security/AST-2018-007.html
http://downloads.asterisk.org/pub/security/AST-2018-008.html
additional change: lua51-path.patch (which would not apply anymore)
replaced with lua_versions.patch to build with the newest lua available
(5.3), BuildRequires updated accordingly.
asterisk.spec | 13 +++++++------
lua51-path.patch | 19 -------------------
lua_versions.patch | 12 ++++++++++++
3 files changed, 19 insertions(+), 25 deletions(-)
---
diff --git a/asterisk.spec b/asterisk.spec
index 78e0d75..d21904a 100644
--- a/asterisk.spec
+++ b/asterisk.spec
@@ -44,19 +44,19 @@
# package is updated to the version used by Asterisk, with all Asterisk
# patches applied and with configuration synced.
-%define pjproject_version 2.7.1
+%define pjproject_version 2.7.2
%define opus_commit a6b9521f10817c1f39f21f90fecd3f00bbb164d0
Summary: Asterisk PBX
Summary(pl.UTF-8): Centralka (PBX) Asterisk
Name: asterisk
-Version: 15.3.0
+Version: 15.4.1
Release: 1
License: GPL v2
Group: Applications/System
Source0:
http://downloads.digium.com/pub/asterisk/releases/%{name}-%{version}.tar.gz
-# Source0-md5: 18c9d26355225c0499a499ef5869156a
+# Source0-md5: bf75531a00db8d565c981cf9b24f6f72
Source1: %{name}.init
Source2: %{name}.sysconfig
Source3: %{name}.tmpfiles
@@ -69,8 +69,8 @@ Source7: menuselect.makeopts
Source8:
https://github.com/seanbright/asterisk-opus/archive/%{opus_commit}/asterisk-opus-%{opus_commit}.tar.gz
# Source8-md5: d2deae1095b6b42331d3060700c25493
Source9:
https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/%{pjproject_version}/pjproject-%{pjproject_version}.tar.bz2
-# Source9-md5: 99a64110fa5c2debff40e0e8d4676380
-Patch0: lua51-path.patch
+# Source9-md5: fa3f0bc098c4bff48ddd92db1c016a7a
+Patch0: lua_versions.patch
Patch1: %{name}-ppc.patch
Patch2: FHS-paths.patch
Patch3: pld-banner.patch
@@ -104,6 +104,7 @@ BuildRequires: iksemel-devel
BuildRequires: imap-devel
%{?with_jack:BuildRequires: jack-audio-connection-kit-devel}
BuildRequires: jansson-devel
+BuildRequires: libatomic-devel
BuildRequires: libcap-devel
BuildRequires: libedit-devel
BuildRequires: libgsm-devel
@@ -117,7 +118,7 @@ BuildRequires: libvorbis-devel
BuildRequires: libxml2-devel >= 2.0
BuildRequires: libxslt-devel
BuildRequires: lpc10-devel
-BuildRequires: lua51-devel >= 5.1
+BuildRequires: lua53-devel >= 5.3
#BuildRequires: mISDNuser-devel < 2
%{?with_mysql:BuildRequires: mysql-devel}
BuildRequires: ncurses-devel
diff --git a/lua51-path.patch b/lua51-path.patch
deleted file mode 100644
index a10bf6b..0000000
--- a/lua51-path.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -dur asterisk-12.0.0.orig/configure.ac asterisk-12.0.0/configure.ac
---- asterisk-12.0.0.orig/configure.ac 2013-12-03 18:59:41.000000000 +0100
-+++ asterisk-12.0.0/configure.ac 2014-01-07 09:42:07.000000000 +0100
-@@ -2113,12 +2113,12 @@
- [${PWLIB_INCLUDE}], [${PWLIB_LIB}])
- fi
-
--AST_EXT_LIB_CHECK([LUA], [lua5.1], [luaL_newstate], [lua5.1/lua.h], [-lm])
-+AST_EXT_LIB_CHECK([LUA], [lua51], [luaL_newstate], [lua51/lua.h], [-lm])
- if test "x${PBX_LUA}" = "x1" ; then
- if test x"${LUA_DIR}" = x; then
-- LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua5.1"
-+ LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua51"
- else
-- LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua5.1"
-+ LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua51"
- fi
- fi
-
diff --git a/lua_versions.patch b/lua_versions.patch
new file mode 100644
index 0000000..59c6fb4
--- /dev/null
+++ b/lua_versions.patch
@@ -0,0 +1,12 @@
+diff -dur asterisk-15.4.1.orig/configure.ac asterisk-15.4.1/configure.ac
+--- asterisk-15.4.1.orig/configure.ac 2018-06-11 23:21:37.000000000 +0200
++++ asterisk-15.4.1/configure.ac 2018-06-12 10:34:15.000000000 +0200
+@@ -2388,7 +2388,7 @@
+ fi
+ AST_EXT_LIB_CHECK([OPUSFILE], [opusfile], [op_open_callbacks],
[opus/opusfile.h], [], [$__opus_include])
+
+-for ver in 5.3 5.2 5.1; do
++for ver in 53 52 51 5.3 5.2 5.1; do
+ AST_EXT_LIB_CHECK([LUA], lua${ver}, [luaL_newstate], lua${ver}/lua.h,
[-lm])
+ if test "x${PBX_LUA}" = "x1" ; then
+ if test x"${LUA_DIR}" = x; then
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/asterisk.git/commitdiff/095ce1e244ebe3ce8ec9508cc5af040da2b924ff
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
