rpms/asterisk/F-13 .cvsignore, 1.36, 1.37 0005-Build-using-external-libedit.patch, 1.7, 1.8 asterisk.spec, 1.74, 1.75 sources, 1.36, 1.37
Jeffrey C. Ollie
jcollie at fedoraproject.org
Tue Mar 9 21:17:02 UTC 2010
- Previous message: rpms/libesmtp/F-11 .cvsignore, 1.5, 1.6 libesmtp.spec, 1.17, 1.18 sources, 1.6, 1.7
- Next message: rpms/asterisk/F-13 0006-Fix-history-loading-when-using-external-libedit.patch, NONE, 1.1 asterisk.spec, 1.75, 1.76
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jcollie
Update of /cvs/pkgs/rpms/asterisk/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18031
Modified Files:
.cvsignore 0005-Build-using-external-libedit.patch
asterisk.spec sources
Log Message:
* Mon Mar 8 2010 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.6-0.1.rc2
- Update to 1.6.2.6-rc2
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-13/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- .cvsignore 1 Mar 2010 14:27:57 -0000 1.36
+++ .cvsignore 9 Mar 2010 21:17:01 -0000 1.37
@@ -1,2 +1,2 @@
-asterisk-1.6.2.5.tar.gz
-asterisk-1.6.2.5.tar.gz.asc
+asterisk-1.6.2.6-rc2.tar.gz
+asterisk-1.6.2.6-rc2.tar.gz.asc
0005-Build-using-external-libedit.patch:
build_tools/menuselect-deps.in | 1 +
configure.ac | 22 ++++++++++++++++++++++
main/Makefile | 8 +++++---
main/cli.c | 3 ++-
makeopts.in | 5 ++++-
5 files changed, 34 insertions(+), 5 deletions(-)
Index: 0005-Build-using-external-libedit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-13/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 30 Sep 2009 16:57:57 -0000 1.7
+++ 0005-Build-using-external-libedit.patch 9 Mar 2010 21:17:02 -0000 1.8
@@ -1,8 +1,28 @@
-Index: build_tools/menuselect-deps.in
-===================================================================
---- build_tools/menuselect-deps.in (revision 221084)
-+++ build_tools/menuselect-deps.in (working copy)
-@@ -19,6 +19,7 @@
+From 6e551983f559c1ca1efa5f452c91f90b20eeb882 Mon Sep 17 00:00:00 2001
+From: Jeffrey C. Ollie <jeff at ocjtech.us>
+Date: Fri, 5 Mar 2010 14:10:52 -0600
+Subject: [PATCH 1/2] Allow linking/building against an external libedit.
+
+The Asterisk tarball includes a very old copy of the editline library
+that manages command line history and editing. Fedora (and several
+other distributions) highly discourage this practice because if there
+are security problems (or even just severe bugs) in the library it can
+be very difficult to track down all instances of the library. This
+patch adds the option of building/linking against an external copy of
+the libedit library.
+---
+ 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(-)
+
+diff --git a/build_tools/menuselect-deps.in b/build_tools/menuselect-deps.in
+index 5f399fc..695622c 100644
+--- a/build_tools/menuselect-deps.in
++++ b/build_tools/menuselect-deps.in
+@@ -21,6 +21,7 @@ ISDNNET=@PBX_ISDNNET@
IXJUSER=@PBX_IXJUSER@
JACK=@PBX_JACK@
LDAP=@PBX_LDAP@
@@ -10,11 +30,11 @@ Index: build_tools/menuselect-deps.in
LTDL=@PBX_LTDL@
LUA=@PBX_LUA@
MISDN=@PBX_MISDN@
-Index: configure.ac
-===================================================================
---- configure.ac (revision 221084)
-+++ configure.ac (working copy)
-@@ -264,6 +264,7 @@
+diff --git a/configure.ac b/configure.ac
+index d4a980d..a9f5646 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -312,6 +312,7 @@ AST_EXT_LIB_SETUP([IODBC], [iODBC], [iodbc])
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,7 +42,7 @@ Index: configure.ac
AST_EXT_LIB_SETUP([LIBXML2], [LibXML2], [libxml2])
AST_EXT_LIB_SETUP([LTDL], [libtool], [ltdl])
AST_EXT_LIB_SETUP([LUA], [Lua], [lua])
-@@ -1667,6 +1668,27 @@
+@@ -1748,6 +1749,27 @@ AC_SUBST(PBX_GTK2)
AC_SUBST(GTK2_INCLUDE)
AC_SUBST(GTK2_LIB)
@@ -50,11 +70,11 @@ Index: configure.ac
AST_LIBCURL_CHECK_CONFIG([], [7.10.1])
# build a GENERIC_ODBC result based on the presence of either UnixODBC (preferred)
-Index: main/Makefile
-===================================================================
---- main/Makefile (revision 221084)
-+++ main/Makefile (working copy)
-@@ -132,6 +132,8 @@
+diff --git a/main/Makefile b/main/Makefile
+index 4b0de7e..8e43a0a 100644
+--- a/main/Makefile
++++ b/main/Makefile
+@@ -142,6 +142,8 @@ testexpr2: ast_expr2f.c ast_expr2.c ast_expr2.h
$(CC) -g -o testexpr2 ast_expr2f.o ast_expr2.o -lm
rm ast_expr2.o ast_expr2f.o
@@ -63,7 +83,7 @@ Index: main/Makefile
ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),)
http.o: _ASTCFLAGS+=$(GMIME_INCLUDE)
endif
-@@ -164,13 +166,13 @@
+@@ -174,13 +176,13 @@ ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),)
GMIMELDFLAGS+=$(GMIME_LIB)
endif
@@ -72,19 +92,19 @@ Index: main/Makefile
@$(CC) -c -o buildinfo.o $(_ASTCFLAGS) buildinfo.c $(ASTCFLAGS)
$(ECHO_PREFIX) echo " [LD] $^ -> $@"
ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),)
-- $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS)
-+ $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS) $(LIBEDIT_LIB)
+- $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS)
++ $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS) $(LIBEDIT_LIB)
else
-- $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS)
-+ $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS) $(LIBEDIT_LIB)
+- $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS)
++ $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS) $(LIBEDIT_LIB)
endif
$(CMD_PREFIX) $(ASTTOPDIR)/build_tools/strip_nonapi $@ || rm $@
-Index: main/cli.c
-===================================================================
---- main/cli.c (revision 221084)
-+++ main/cli.c (working copy)
-@@ -36,6 +36,8 @@
+diff --git a/main/cli.c b/main/cli.c
+index e411c0d..2b6624f 100644
+--- a/main/cli.c
++++ b/main/cli.c
+@@ -36,6 +36,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include <pwd.h>
#include <grp.h>
@@ -93,7 +113,7 @@ Index: main/cli.c
#include "asterisk/cli.h"
#include "asterisk/linkedlists.h"
#include "asterisk/module.h"
-@@ -44,7 +46,6 @@
+@@ -44,7 +46,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/utils.h"
#include "asterisk/app.h"
#include "asterisk/lock.h"
@@ -101,11 +121,11 @@ Index: main/cli.c
#include "asterisk/threadstorage.h"
/*!
-Index: makeopts.in
-===================================================================
---- makeopts.in (revision 221084)
-+++ makeopts.in (working copy)
-@@ -263,3 +263,7 @@
+diff --git a/makeopts.in b/makeopts.in
+index a8adbad..c314b9f 100644
+--- a/makeopts.in
++++ b/makeopts.in
+@@ -265,3 +265,7 @@ TINFO_DIR=@TINFO_DIR@
# if poll is not present, let the makefile know.
POLL_AVAILABLE=@HAS_POLL@
TIMERFD_INCLUDE=@TIMERFD_INCLUDE@
@@ -113,3 +133,6 @@ Index: makeopts.in
+LIBEDIT_INCLUDE=@LIBEDIT_INCLUDE@
+LIBEDIT_LIB=@LIBEDIT_LIB@
+LIBEDIT_OBJ=@LIBEDIT_OBJ@
+--
+1.6.6.1
+
Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-13/asterisk.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- asterisk.spec 1 Mar 2010 14:27:57 -0000 1.74
+++ asterisk.spec 9 Mar 2010 21:17:02 -0000 1.75
@@ -1,8 +1,8 @@
-#global _rc 1
+%global _rc 2
Summary: The Open Source PBX
Name: asterisk
-Version: 1.6.2.5
-Release: 1%{?_rc:.rc%{_rc}}%{?dist}
+Version: 1.6.2.6
+Release: 0.1%{?_rc:.rc%{_rc}}%{?dist}
License: GPLv2
Group: Applications/Internet
URL: http://www.asterisk.org/
@@ -16,7 +16,9 @@ Source5: http://downloads.asterisk.org/p
Patch1: 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch
Patch2: 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
+# Submitted upstream: https://issues.asterisk.org/view.php?id=16858
Patch5: 0005-Build-using-external-libedit.patch
+Patch6: 0006-Fix-history-loading-when-using-external-libedit.patch
# Submitted upstream: https://issues.asterisk.org/view.php?id=16155
Patch8: 0008-change-configure.ac-to-look-for-pkg-config-gmime-2.0.patch
@@ -391,7 +393,8 @@ local filesystem.
%setup0 -q -n asterisk-%{version}%{?_rc:-rc%{_rc}}
%patch1 -p0
%patch2 -p0
-%patch5 -p0
+%patch5 -p1
+%patch6 -p1
%patch8 -p0
%patch11 -p0
%patch12 -p1
@@ -436,10 +439,6 @@ pushd menuselect
%configure
popd
-pushd main/editline
-%configure
-popd
-
%if 0%{?fedora} > 0
%configure --with-imap=system --with-gsm=/usr --with-libedit=yes
%else
@@ -1039,6 +1038,12 @@ fi
%{_libdir}/asterisk/modules/app_voicemail_plain.so
%changelog
+* Mon Mar 8 2010 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.6-0.1.rc2
+- Update to 1.6.2.6-rc2
+
+* Mon Mar 8 2010 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.5-2
+- Add a patch that fixes CLI history when linking against external libedit.
+
* Thu Feb 25 2010 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.5-1
- Update to 1.6.2.5
-
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-13/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- sources 1 Mar 2010 14:27:57 -0000 1.36
+++ sources 9 Mar 2010 21:17:02 -0000 1.37
@@ -1,2 +1,2 @@
-9d1f7bcf6833605ced4b2740d14bd576 asterisk-1.6.2.5.tar.gz
-505a19daad64bbf74f8f3a75bd3caec0 asterisk-1.6.2.5.tar.gz.asc
+a94d0b143515a2d0fb410ed642287add asterisk-1.6.2.6-rc2.tar.gz
+516e85781f5cb0a8896de8cdd2f15ba4 asterisk-1.6.2.6-rc2.tar.gz.asc
- Previous message: rpms/libesmtp/F-11 .cvsignore, 1.5, 1.6 libesmtp.spec, 1.17, 1.18 sources, 1.6, 1.7
- Next message: rpms/asterisk/F-13 0006-Fix-history-loading-when-using-external-libedit.patch, NONE, 1.1 asterisk.spec, 1.75, 1.76
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list