[asterisk] Update patches.
Jeffrey C. Ollie
jcollie at fedoraproject.org
Fri Oct 8 14:30:41 UTC 2010
commit 68101a364e2e70c1f31f4ab49a915f5ecc99370a
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Fri Oct 8 09:30:36 2010 -0500
Update patches.
...it-scripts-for-better-Fedora-compatibilty.patch | 2 +-
...les.conf-so-that-different-voicemail-modu.patch | 2 +-
...king-building-against-an-external-libedit.patch | 12 ++--
...rary-function-for-loading-command-history.patch | 2 +-
...igure.ac-to-look-for-pkg-config-gmime-2.0.patch | 6 +-
0006-Fix-up-some-paths.patch | 56 ++++++++++----------
...hema-that-is-compatible-with-Fedora-Direc.patch | 2 +-
...2html-to-copy-icons-when-building-documen.patch | 2 +-
8 files changed, 42 insertions(+), 42 deletions(-)
---
diff --git a/0001-Modify-init-scripts-for-better-Fedora-compatibilty.patch b/0001-Modify-init-scripts-for-better-Fedora-compatibilty.patch
index 812f3e1..af03d94 100644
--- a/0001-Modify-init-scripts-for-better-Fedora-compatibilty.patch
+++ b/0001-Modify-init-scripts-for-better-Fedora-compatibilty.patch
@@ -1,4 +1,4 @@
-From 071c7711d55c1a08c37ccf3d2cf797d12cd7d181 Mon Sep 17 00:00:00 2001
+From 906597e0b73d5cb1a90d5cbf0eafb5a7fe8985e1 Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Wed, 28 Jul 2010 07:22:21 -0500
Subject: [PATCH 1/8] Modify init scripts for better Fedora compatibilty.
diff --git a/0002-Modify-modules.conf-so-that-different-voicemail-modu.patch b/0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
index 9715760..9a1003a 100644
--- a/0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
+++ b/0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
@@ -1,4 +1,4 @@
-From 56ebbf9719651ec3f0820cc05628f71d0f13dd34 Mon Sep 17 00:00:00 2001
+From a339fb3881ef3681412e7876410a2a989f7a6483 Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Wed, 28 Jul 2010 07:23:49 -0500
Subject: [PATCH 2/8] Modify modules.conf so that different voicemail modules don't load at the same time.
diff --git a/0003-Allow-linking-building-against-an-external-libedit.patch b/0003-Allow-linking-building-against-an-external-libedit.patch
index 5e2943c..99a706c 100644
--- a/0003-Allow-linking-building-against-an-external-libedit.patch
+++ b/0003-Allow-linking-building-against-an-external-libedit.patch
@@ -1,4 +1,4 @@
-From ad148a5446a0c1fdb2f189bca2a1a5501ed9fc5e Mon Sep 17 00:00:00 2001
+From a9ab6278a7bae71dd51bd32a67e7691db1a6fbb8 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 3/8] Allow linking/building against an external libedit.
@@ -31,10 +31,10 @@ index 2a5bcd7..a0f4e16 100644
LUA=@PBX_LUA@
MISDN=@PBX_MISDN@
diff --git a/configure.ac b/configure.ac
-index 75a5ed0..e8a6013 100644
+index bacef33..dc73ca4 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -337,6 +337,7 @@ AST_EXT_LIB_SETUP([JACK], [Jack Audio Connection Kit], [jack])
+@@ -387,6 +387,7 @@ AST_EXT_LIB_SETUP([JACK], [Jack Audio Connection Kit], [jack])
AST_EXT_LIB_SETUP([KQUEUE], [kqueue support], [kqueue])
AST_EXT_LIB_SETUP([LDAP], [OpenLDAP], [ldap])
AST_LIBCURL_CHECK_CONFIG([], [7.10.1])
@@ -42,7 +42,7 @@ index 75a5ed0..e8a6013 100644
AST_EXT_LIB_SETUP([LIBXML2], [LibXML2], [libxml2])
AST_EXT_LIB_SETUP([LTDL], [libtool], [ltdl])
AST_EXT_LIB_SETUP([LUA], [Lua], [lua])
-@@ -2056,6 +2057,27 @@ AC_SUBST(PBX_GTK2)
+@@ -2119,6 +2120,27 @@ AC_SUBST(PBX_GTK2)
AC_SUBST(GTK2_INCLUDE)
AC_SUBST(GTK2_LIB)
@@ -123,10 +123,10 @@ index 77e52b8..3408b5c 100644
#include "asterisk/translate.h"
diff --git a/makeopts.in b/makeopts.in
-index 2680968..b8db6a3 100644
+index 5e9ef8c..02b3b51 100644
--- a/makeopts.in
+++ b/makeopts.in
-@@ -291,3 +291,7 @@ TINFO_DIR=@TINFO_DIR@
+@@ -305,3 +305,7 @@ TINFO_DIR=@TINFO_DIR@
# if poll is not present, let the makefile know.
POLL_AVAILABLE=@HAS_POLL@
TIMERFD_INCLUDE=@TIMERFD_INCLUDE@
diff --git a/0004-Use-the-library-function-for-loading-command-history.patch b/0004-Use-the-library-function-for-loading-command-history.patch
index f026354..1a685f3 100644
--- a/0004-Use-the-library-function-for-loading-command-history.patch
+++ b/0004-Use-the-library-function-for-loading-command-history.patch
@@ -1,4 +1,4 @@
-From 2ba95628e1eb8ba87adcf133b8ae6c6f5a4f82cd Mon Sep 17 00:00:00 2001
+From 3bf70fb59b3b4e19f7f289f0cd240e13d6f8624c Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Mon, 8 Mar 2010 12:38:56 -0600
Subject: [PATCH 4/8] Use the library function for loading command history rather than implementing our own.
diff --git a/0005-Change-configure.ac-to-look-for-pkg-config-gmime-2.0.patch b/0005-Change-configure.ac-to-look-for-pkg-config-gmime-2.0.patch
index 7bf03e4..324bd6a 100644
--- a/0005-Change-configure.ac-to-look-for-pkg-config-gmime-2.0.patch
+++ b/0005-Change-configure.ac-to-look-for-pkg-config-gmime-2.0.patch
@@ -1,4 +1,4 @@
-From db9b59864172ebcfc25d51bfe0d7f949265bf2bb Mon Sep 17 00:00:00 2001
+From c886d6aa47a2a8fa6edfe448a842a16453fe84ed Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Wed, 28 Jul 2010 07:26:02 -0500
Subject: [PATCH 5/8] Change configure.ac to look for pkg-config gmime-2.0
@@ -8,10 +8,10 @@ Subject: [PATCH 5/8] Change configure.ac to look for pkg-config gmime-2.0
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/configure.ac b/configure.ac
-index e8a6013..d1ddb3a 100644
+index dc73ca4..027e22b 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -1905,7 +1905,17 @@ then
+@@ -1968,7 +1968,17 @@ then
CFLAGS="${saved_cflags}"
fi
diff --git a/0006-Fix-up-some-paths.patch b/0006-Fix-up-some-paths.patch
index 44dcc3d..3474dea 100644
--- a/0006-Fix-up-some-paths.patch
+++ b/0006-Fix-up-some-paths.patch
@@ -1,4 +1,4 @@
-From af9315c7c526d112f03561c42236981e3e6ce57d Mon Sep 17 00:00:00 2001
+From c80e9b4ee3c6334eb63e3e238612c2acce50dcef Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Wed, 28 Jul 2010 07:27:48 -0500
Subject: [PATCH 6/8] Fix up some paths
@@ -510,10 +510,10 @@ index b7e953e..48baaef 100755
}
762 => {
diff --git a/pbx/ael/ael-test/ref.ael-vtest13 b/pbx/ael/ael-test/ref.ael-vtest13
-index 07ae29e..70956d4 100644
+index acecaaa..e205a2c 100644
--- a/pbx/ael/ael-test/ref.ael-vtest13
+++ b/pbx/ael/ael-test/ref.ael-vtest13
-@@ -2107,7 +2107,7 @@ exten => s,20,Return()
+@@ -2182,7 +2182,7 @@ exten => s,20,Return()
[callerid-liar]
@@ -522,34 +522,34 @@ index 07ae29e..70956d4 100644
exten => s,2,Background(priv-liar)
exten => s,3,Hangup()
exten => s,4,Return()
-@@ -2142,7 +2142,7 @@ exten => s,3,Set(repeatcount=0)
- exten => s,4,Zapateller(nocallerid)
- exten => s,5,PrivacyManager()
- exten => s,6,GotoIf($["${PRIVACYMGRSTATUS}" = "FAILED" ]?7:11)
--exten => s,7,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm)
-+exten => s,7,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm)
- exten => s,8,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
- exten => s,9,Hangup()
- exten => s,10,Return()
-@@ -2168,7 +2168,7 @@ exten => s,29,GotoIf($["${direct}" != "" & ${direct} != 0 ]?30:37)
- exten => s,30,verbose(direct is XXX#${direct}XXXX)
- exten => s,31,Playback(greetings/direct)
- exten => s,32,Playback(/var/spool/asterisk/voicemail/default/${direct}/greet)
--exten => s,33,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => s,33,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
- exten => s,34,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&)
- exten => s,35,Goto(sw-92-${direct},10)
- exten => s,36,NoOp(Finish switch-if-homeline-91-92)
-@@ -2247,7 +2247,7 @@ exten => sw-92-2,10,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket
- exten => sw-92-2,11,Goto(s,loopback)
- exten => sw-92-1,10,Gosub(std-priv-exten,s,1(Zap/6r3&Sip/murf,1,25,mpA(beep)tw,telemarket,telemarket))
- exten => sw-92-1,11,Goto(s,loopback)
+@@ -2218,7 +2218,7 @@ exten => s,4,Set(repeatcount=0)
+ exten => s,5,Zapateller(nocallerid)
+ exten => s,6,PrivacyManager()
+ exten => s,7,GotoIf($["${PRIVACYMGRSTATUS}" = "FAILED" ]?8:12)
+-exten => s,8,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm)
++exten => s,8,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm)
+ exten => s,9,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
+ exten => s,10,Hangup()
+ exten => s,11,Return()
+@@ -2244,7 +2244,7 @@ exten => s,30,GotoIf($["${direct}" != "" & ${direct} != 0 ]?31:38)
+ exten => s,31,verbose(direct is XXX#${direct}XXXX)
+ exten => s,32,Playback(greetings/direct)
+ exten => s,33,Playback(/var/spool/asterisk/voicemail/default/${direct}/greet)
+-exten => s,34,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
++exten => s,34,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
+ exten => s,35,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&)
+ exten => s,36,Goto(sw_92_${direct},10)
+ exten => s,37,NoOp(Finish switch_if_homeline_91_92)
+@@ -2323,7 +2323,7 @@ exten => sw_92_2,10,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket
+ exten => sw_92_2,11,Goto(s,loopback)
+ exten => sw_92_1,10,Gosub(std-priv-exten,s,1(Zap/6r3&Sip/murf,1,25,mpA(beep)tw,telemarket,telemarket))
+ exten => sw_92_1,11,Goto(s,loopback)
-exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&)
exten => 1,3,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
exten => 1,4,Goto(s,loopback)
-@@ -2324,31 +2324,31 @@ exten => o,1,Goto(s,begin)
+@@ -2400,31 +2400,31 @@ exten => o,1,Goto(s,begin)
[homeline-kids]
exten => s,1(begin),Background(murphy-homeline-kids)
@@ -588,7 +588,7 @@ index 07ae29e..70956d4 100644
exten => 7,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&)
exten => 7,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket))
exten => 7,4,Goto(homeline,s,loopback)
-@@ -2376,7 +2376,7 @@ exten => s,5,Gosub(fillcidname,s,1)
+@@ -2452,7 +2452,7 @@ exten => s,5,Gosub(fillcidname,s,1)
exten => s,6,TrySystem(/usr/local/bin/who-is-it ${CALLERID(num)} "${CALLERID(name)}"&)
exten => s,7(loopback),Background(greetings/greeting)
exten => s,8,Background(murphy-office-intro1)
@@ -597,7 +597,7 @@ index 07ae29e..70956d4 100644
exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&)
exten => 1,3,Gosub(std-priv-exten,s,1(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket))
exten => 1,4,Goto(s,loopback)
-@@ -2502,7 +2502,7 @@ exten => 6,1,Background(recording)
+@@ -2578,7 +2578,7 @@ exten => 6,1,Background(recording)
exten => 760,1,DateTime()
exten => 760,2,Goto(s,loopback)
exten => 761,1,Record(announcement:gsm)
diff --git a/0007-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch b/0007-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
index e66de12..2d50608 100644
--- a/0007-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
+++ b/0007-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
@@ -1,4 +1,4 @@
-From 0a424bebe5d788c9367f356dcd567d5ae51e34a7 Mon Sep 17 00:00:00 2001
+From 6b0bece73fea9b71b815a641d3d6af96715b115e Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Sun, 4 Jan 2009 19:22:39 -0600
Subject: [PATCH 7/8] Add LDAP schema that is compatible with Fedora Directory Server.
diff --git a/0008-Tell-laxtex2html-to-copy-icons-when-building-documen.patch b/0008-Tell-laxtex2html-to-copy-icons-when-building-documen.patch
index cc9a1e6..1c956a5 100644
--- a/0008-Tell-laxtex2html-to-copy-icons-when-building-documen.patch
+++ b/0008-Tell-laxtex2html-to-copy-icons-when-building-documen.patch
@@ -1,4 +1,4 @@
-From 228b8bb72289b5c9c51bc8ef208d01c8ee3cb12a Mon Sep 17 00:00:00 2001
+From 096ef48c19272cab10e036ec2c417b8be23e4378 Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Wed, 28 Jul 2010 07:32:19 -0500
Subject: [PATCH 8/8] Tell laxtex2html to copy icons when building documentation so that we don't have run-time dependencies on latex2html.
More information about the scm-commits
mailing list