rpms/asterisk/F-11 0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch, NONE, 1.1 0005-Build-using-external-libedit.patch, 1.7, 1.8 asterisk.spec, 1.55, 1.56 sources, 1.23, 1.24
Jeffrey C. Ollie
jcollie at fedoraproject.org
Tue Oct 27 15:53:02 UTC 2009
Author: jcollie
Update of /cvs/pkgs/rpms/asterisk/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13184
Modified Files:
0005-Build-using-external-libedit.patch asterisk.spec sources
Added Files:
0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch
Log Message:
* Tue Oct 27 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1.8-1
- Update to 1.6.1.8 to fix bug 531199:
-
- http://downloads.asterisk.org/pub/security/AST-2009-007.html
-
- A missing ACL check for handling SIP INVITEs allows a device to make
- calls on networks intended to be prohibited as defined by the "deny"
- and "permit" lines in sip.conf. The ACL check for handling SIP
- registrations was not affected.
0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch:
pbx_lua.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
--- NEW FILE 0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch ---
>From a092080315b7bfa9b7d174b6114cb957ac1590d8 Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Fri, 10 Oct 2008 11:54:10 -0500
Subject: [PATCH 08/15] Revert changes to pbx_lua from rev 126363 that cause some problems.
---
pbx/pbx_lua.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/pbx/pbx_lua.c b/pbx/pbx_lua.c
index 6a600a4..a803bd5 100644
--- a/pbx/pbx_lua.c
+++ b/pbx/pbx_lua.c
@@ -42,9 +42,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/paths.h"
#include "asterisk/hashtab.h"
-#include <lua5.1/lua.h>
-#include <lua5.1/lauxlib.h>
-#include <lua5.1/lualib.h>
+#include <lua.h>
+#include <lauxlib.h>
+#include <lualib.h>
static char *config = "extensions.lua";
static char *registrar = "pbx_lua";
--
1.6.1
0005-Build-using-external-libedit.patch:
build_tools/menuselect-deps.in | 1 +
configure.ac | 22 ++++++++++++++++++++++
main/Makefile | 8 +++++---
main/cli.c | 3 ++-
makeopts.in | 4 ++++
5 files changed, 34 insertions(+), 4 deletions(-)
Index: 0005-Build-using-external-libedit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-11/0005-Build-using-external-libedit.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- 0005-Build-using-external-libedit.patch 8 Oct 2009 13:45:31 -0000 1.7
+++ 0005-Build-using-external-libedit.patch 27 Oct 2009 15:53:00 -0000 1.8
@@ -1,6 +1,6 @@
Index: build_tools/menuselect-deps.in
===================================================================
---- build_tools/menuselect-deps.in (revision 222649)
+--- build_tools/menuselect-deps.in (revision 226061)
+++ build_tools/menuselect-deps.in (working copy)
@@ -17,6 +17,7 @@
IXJUSER=@PBX_IXJUSER@
@@ -12,9 +12,9 @@ Index: build_tools/menuselect-deps.in
MISDN=@PBX_MISDN@
Index: configure.ac
===================================================================
---- configure.ac (revision 222649)
+--- configure.ac (revision 226061)
+++ configure.ac (working copy)
-@@ -244,6 +244,7 @@
+@@ -232,6 +232,7 @@
AST_EXT_LIB_SETUP([ISDNNET], [ISDN4Linux Library], [isdnnet])
AST_EXT_LIB_SETUP([JACK], [Jack Audio Connection Kit], [jack])
AST_EXT_LIB_SETUP([LDAP], [OpenLDAP], [ldap])
@@ -22,9 +22,9 @@ Index: configure.ac
AST_EXT_LIB_SETUP([LTDL], [libtool], [ltdl])
AST_EXT_LIB_SETUP([LUA], [Lua], [lua])
AST_EXT_LIB_SETUP([MISDN], [mISDN User Library], [misdn])
-@@ -1605,6 +1606,27 @@
- AC_SUBST(GTK2_INCLUDE)
- AC_SUBST(GTK2_LIB)
+@@ -1593,6 +1594,27 @@
+ AST_EXT_LIB_CHECK([SDL_IMAGE], [SDL_image], [IMG_Load], [SDL_image.h], [${SDL_LIB}], [${SDL_INCLUDE}])
+ AST_EXT_LIB_CHECK([FFMPEG], [avcodec], [sws_getContext], [ffmpeg/avcodec.h], [-lpthread -lz -lm])
+PBX_LIBEDIT=0
+LIBEDIT_INCLUDE=-Ieditline/readline
@@ -47,12 +47,12 @@ Index: configure.ac
+AC_SUBST(LIBEDIT_LIB)
+AC_SUBST(LIBEDIT_OBJ)
+
- AST_LIBCURL_CHECK_CONFIG([], [7.10.1])
-
- AC_CONFIG_FILES([build_tools/menuselect-deps makeopts channels/h323/Makefile])
+ # possible places for video4linux version 1
+ AC_CHECK_HEADER([linux/videodev.h],
+ [AC_DEFINE_UNQUOTED([HAVE_VIDEODEV_H], 1, [Define to 1 if your system has linux/videodev.h.])])
Index: main/Makefile
===================================================================
---- main/Makefile (revision 222649)
+--- main/Makefile (revision 226061)
+++ main/Makefile (working copy)
@@ -129,6 +129,8 @@
$(CC) -g -o testexpr2 ast_expr2f.o ast_expr2.o -lm
@@ -82,7 +82,7 @@ Index: main/Makefile
Index: main/cli.c
===================================================================
---- main/cli.c (revision 222649)
+--- main/cli.c (revision 226061)
+++ main/cli.c (working copy)
@@ -34,6 +34,8 @@
#include <ctype.h>
@@ -103,9 +103,9 @@ Index: main/cli.c
/*!
Index: makeopts.in
===================================================================
---- makeopts.in (revision 222649)
+--- makeopts.in (revision 226061)
+++ makeopts.in (working copy)
-@@ -249,3 +249,7 @@
+@@ -246,3 +246,7 @@
# if poll is not present, let the makefile know.
POLL_AVAILABLE=@HAS_POLL@
Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-11/asterisk.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- asterisk.spec 25 Oct 2009 12:47:10 -0000 1.55
+++ asterisk.spec 27 Oct 2009 15:53:01 -0000 1.56
@@ -1,8 +1,8 @@
-%define _rc 2
+#define _rc 2
Summary: The Open Source PBX
Name: asterisk
-Version: 1.6.1.7
-Release: 0.4%{?_rc:.rc%{_rc}}%{?dist}
+Version: 1.6.1.8
+Release: 1%{?_rc:.rc%{_rc}}%{?dist}
License: GPLv2
Group: Applications/Internet
URL: http://www.asterisk.org/
@@ -12,12 +12,12 @@ Source1: asterisk-logrotate
Source2: menuselect.makedeps
Source3: menuselect.makeopts
Source5: http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-%{version}%{?_rc:-rc%{_rc}}.tar.gz.asc
-Source6: asterisk-developer-pubring.gpg
Patch1: 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch
Patch2: 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
Patch5: 0005-Build-using-external-libedit.patch
Patch8: 0008-change-configure.ac-to-look-for-pkg-config-gmime-2.0.patch
+Patch9: 0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch
Patch11: 0011-Fix-up-some-paths.patch
Patch12: 0012-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
@@ -383,6 +383,7 @@ local filesystem.
%patch2 -p0
%patch5 -p0
%patch8 -p0
+%patch9 -p1
%patch11 -p0
%patch12 -p1
@@ -497,6 +498,8 @@ rm -rf %{buildroot}%{_datadir}/asterisk/
rm -rf %{buildroot}%{_sbindir}/hashtest
rm -rf %{buildroot}%{_sbindir}/hashtest2
+rm -rf %{buildroot}%{_datadir}/asterisk/firmware/iax/*
+
find doc/api/html -name \*.map -size 0 -delete
%clean
@@ -990,6 +993,16 @@ fi
%{_libdir}/asterisk/modules/app_voicemail_plain.so
%changelog
+* Tue Oct 27 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1.8-1
+- Update to 1.6.1.8 to fix bug 531199:
+-
+- http://downloads.asterisk.org/pub/security/AST-2009-007.html
+-
+- A missing ACL check for handling SIP INVITEs allows a device to make
+- calls on networks intended to be prohibited as defined by the "deny"
+- and "permit" lines in sip.conf. The ACL check for handling SIP
+- registrations was not affected.
+
* Sat Oct 24 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1.7-0.4.rc2
- Add an AST_EXTRA_ARGS option to the init script
- have the init script to cd to /var/spool/asterisk to prevent annoying message
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-11/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources 8 Oct 2009 13:45:31 -0000 1.23
+++ sources 27 Oct 2009 15:53:01 -0000 1.24
@@ -1,3 +1,2 @@
-dd089905d0ba9a514359dc2cf1a53303 asterisk-developer-pubring.gpg
-c25b294aa92b547fab5484bf436c9dd2 asterisk-1.6.1.7-rc2.tar.gz
-863d39c44b7ea1c6588535f1a56c2b1a asterisk-1.6.1.7-rc2.tar.gz.asc
+98ed805d9c0579942b26e056506a62c0 asterisk-1.6.1.8.tar.gz
+f1ef4d98dadea6ee91f153f9180fea0a asterisk-1.6.1.8.tar.gz.asc
More information about the fedora-extras-commits
mailing list