From e5ce1e9b8d503a4e152a6932e3ad6b273543dcb3 Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jcollie@fedoraproject.org>
Date: Mar 08 2010 14:30:01 +0000
Subject: - Update to 1.6.2.5

-
- * AST-2010-002: Invalid parsing of ACL rules can compromise security

---

diff --git a/0006-Fix-history-loading-when-using-external-libedit.patch b/0006-Fix-history-loading-when-using-external-libedit.patch
new file mode 100644
index 0000000..1675a00
--- /dev/null
+++ b/0006-Fix-history-loading-when-using-external-libedit.patch
@@ -0,0 +1,36 @@
+Index: main/asterisk.c
+===================================================================
+--- main/asterisk.c	(revision 250967)
++++ main/asterisk.c	(working copy)
+@@ -2567,29 +2567,12 @@
+ 
+ static int ast_el_read_history(char *filename)
+ {
+-	char buf[MAX_HISTORY_COMMAND_LENGTH];
+-	FILE *f;
+-	int ret = -1;
++	HistEvent ev;
+ 
+ 	if (el_hist == NULL || el == NULL)
+ 		ast_el_initialize();
+ 
+-	if ((f = fopen(filename, "r")) == NULL)
+-		return ret;
+-
+-	while (!feof(f)) {
+-		if (!fgets(buf, sizeof(buf), f))
+-			break;
+-		if (!strcmp(buf, "_HiStOrY_V2_\n"))
+-			continue;
+-		if (ast_all_zeros(buf))
+-			continue;
+-		if ((ret = ast_el_add_history(buf)) == -1)
+-			break;
+-	}
+-	fclose(f);
+-
+-	return ret;
++	return (history(el_hist, &ev, H_LOAD, filename));
+ }
+ 
+ static void ast_remotecontrol(char *data)
diff --git a/asterisk.spec b/asterisk.spec
index a8e434c..3c58697 100644
--- a/asterisk.spec
+++ b/asterisk.spec
@@ -2,7 +2,7 @@
 Summary: The Open Source PBX
 Name: asterisk
 Version: 1.6.2.5
-Release: 1%{?_rc:.rc%{_rc}}%{?dist}
+Release: 2%{?_rc:.rc%{_rc}}%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -16,7 +16,9 @@ Source5: http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-
 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
@@ -392,6 +394,7 @@ local filesystem.
 %patch1 -p0
 %patch2 -p0
 %patch5 -p0
+%patch6 -p0
 %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