[asterisk/f16] patch for res_pktccops
Jeffrey C. Ollie
jcollie at fedoraproject.org
Tue Sep 20 17:13:56 UTC 2011
commit 547b78815914cdde1767fc3c7e1985036d192a66
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Tue Sep 20 12:13:44 2011 -0500
patch for res_pktccops
...it-scripts-for-better-Fedora-compatibilty.patch | 2 +-
...les.conf-so-that-different-voicemail-modu.patch | 2 +-
...king-building-against-an-external-libedit.patch | 2 +-
...rary-function-for-loading-command-history.patch | 2 +-
0005-Fix-up-some-paths.patch | 2 +-
...hema-that-is-compatible-with-Fedora-Direc.patch | 2 +-
...chan_mgcp-and-res_pktccops-because-res_pk.patch | 2 +-
...hat-AST_ARGS-is-used-consistently-in-Fedo.patch | 2 +-
...se-consistently-in-the-Fedora-init-script.patch | 2 +-
...hat-the-Fedora-init-script-can-find-the-p.patch | 2 +-
...the-inotify-code-to-handle-call-files-bei.patch | 2 +-
0012-Fix-two-problems-with-app_sms.patch | 2 +-
...k-lines-to-improve-compat-with-389-Direct.patch | 2 +-
...-the-config-in-res_pktccops.conf-for-extr.patch | 80 ++++++++++++++++++++
asterisk.spec | 10 ++-
15 files changed, 102 insertions(+), 14 deletions(-)
---
diff --git a/0001-Modify-init-scripts-for-better-Fedora-compatibilty.patch b/0001-Modify-init-scripts-for-better-Fedora-compatibilty.patch
index 8a836e2..7828e41 100644
--- a/0001-Modify-init-scripts-for-better-Fedora-compatibilty.patch
+++ b/0001-Modify-init-scripts-for-better-Fedora-compatibilty.patch
@@ -1,7 +1,7 @@
From c9e668f62d3cce2df1ab80f16727debd99739764 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 01/13] Modify init scripts for better Fedora compatibilty.
+Subject: [PATCH 01/14] Modify init scripts for better Fedora compatibilty.
---
contrib/init.d/rc.redhat.asterisk | 70 ++++++++++++++++++++-----------------
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 84e285d..92a2b30 100644
--- a/0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
+++ b/0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
@@ -1,7 +1,7 @@
From 1762acc9571412d03e5ef5fcf936bc0046e8f152 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 02/13] Modify modules.conf so that different voicemail
+Subject: [PATCH 02/14] 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 cb1b38a..f413f91 100644
--- a/0003-Allow-linking-building-against-an-external-libedit.patch
+++ b/0003-Allow-linking-building-against-an-external-libedit.patch
@@ -1,7 +1,7 @@
From 2ec862ecc0024bd4e9a14bd0a2ddc62ad75465ea 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 03/13] Allow linking/building against an external libedit.
+Subject: [PATCH 03/14] 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
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 c09734f..5f9092a 100644
--- a/0004-Use-the-library-function-for-loading-command-history.patch
+++ b/0004-Use-the-library-function-for-loading-command-history.patch
@@ -1,7 +1,7 @@
From d7df9875b514750095d24cb6e169ae57bb73c453 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 04/13] Use the library function for loading command history
+Subject: [PATCH 04/14] Use the library function for loading command history
rather than implementing our own.
---
diff --git a/0005-Fix-up-some-paths.patch b/0005-Fix-up-some-paths.patch
index 46fbfa8..de75580 100644
--- a/0005-Fix-up-some-paths.patch
+++ b/0005-Fix-up-some-paths.patch
@@ -1,7 +1,7 @@
From 727299938816d2555db864f557473ea4d77856e4 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 05/13] Fix up some paths
+Subject: [PATCH 05/14] Fix up some paths
---
UPGRADE-1.4.txt | 2 +-
diff --git a/0006-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch b/0006-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
index 09d7abc..677f314 100644
--- a/0006-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
+++ b/0006-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
@@ -1,7 +1,7 @@
From 802da5c86e571b909bd198fc9460ac5230ef4191 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 06/13] Add LDAP schema that is compatible with Fedora
+Subject: [PATCH 06/14] Add LDAP schema that is compatible with Fedora
Directory Server.
---
diff --git a/0007-Don-t-load-chan_mgcp-and-res_pktccops-because-res_pk.patch b/0007-Don-t-load-chan_mgcp-and-res_pktccops-because-res_pk.patch
index 90406c5..2541ca3 100644
--- a/0007-Don-t-load-chan_mgcp-and-res_pktccops-because-res_pk.patch
+++ b/0007-Don-t-load-chan_mgcp-and-res_pktccops-because-res_pk.patch
@@ -1,7 +1,7 @@
From f1233019198363c12025f76b710995dfee0e2d38 Mon Sep 17 00:00:00 2001
From: "Jeffrey C. Ollie" <jeff at ocjtech.us>
Date: Tue, 20 Sep 2011 08:40:49 -0500
-Subject: [PATCH 07/13] Don't load chan_mgcp and res_pktccops because
+Subject: [PATCH 07/14] Don't load chan_mgcp and res_pktccops because
res_pktccops floods 192.168.0.24 in the default
config
diff --git a/0008-Make-sure-that-AST_ARGS-is-used-consistently-in-Fedo.patch b/0008-Make-sure-that-AST_ARGS-is-used-consistently-in-Fedo.patch
index 9403b6d..d249eb8 100644
--- a/0008-Make-sure-that-AST_ARGS-is-used-consistently-in-Fedo.patch
+++ b/0008-Make-sure-that-AST_ARGS-is-used-consistently-in-Fedo.patch
@@ -1,7 +1,7 @@
From 48a7a760e910ce6afd59e83ca1e01e62876c59cc Mon Sep 17 00:00:00 2001
From: "Jeffrey C. Ollie" <jeff at ocjtech.us>
Date: Tue, 20 Sep 2011 09:11:13 -0500
-Subject: [PATCH 08/13] Make sure that AST_ARGS is used consistently in Fedora
+Subject: [PATCH 08/14] Make sure that AST_ARGS is used consistently in Fedora
init script
---
diff --git a/0009-Use-consistently-in-the-Fedora-init-script.patch b/0009-Use-consistently-in-the-Fedora-init-script.patch
index 56659ef..96722e9 100644
--- a/0009-Use-consistently-in-the-Fedora-init-script.patch
+++ b/0009-Use-consistently-in-the-Fedora-init-script.patch
@@ -1,7 +1,7 @@
From 382a378507925b935b130241bd73d2d7e402c006 Mon Sep 17 00:00:00 2001
From: "Jeffrey C. Ollie" <jeff at ocjtech.us>
Date: Tue, 20 Sep 2011 09:12:02 -0500
-Subject: [PATCH 09/13] Use consistently in the Fedora init script
+Subject: [PATCH 09/14] Use consistently in the Fedora init script
---
contrib/init.d/rc.redhat.asterisk | 2 +-
diff --git a/0010-Make-sure-that-the-Fedora-init-script-can-find-the-p.patch b/0010-Make-sure-that-the-Fedora-init-script-can-find-the-p.patch
index 32dc2dc..7b89b86 100644
--- a/0010-Make-sure-that-the-Fedora-init-script-can-find-the-p.patch
+++ b/0010-Make-sure-that-the-Fedora-init-script-can-find-the-p.patch
@@ -1,7 +1,7 @@
From 6a57b68b22473802e2a5d133ba24fd8f24f4be20 Mon Sep 17 00:00:00 2001
From: "Jeffrey C. Ollie" <jeff at ocjtech.us>
Date: Tue, 20 Sep 2011 09:12:57 -0500
-Subject: [PATCH 10/13] Make sure that the Fedora init script can find the pid
+Subject: [PATCH 10/14] Make sure that the Fedora init script can find the pid
file.
---
diff --git a/0011-This-fixes-the-inotify-code-to-handle-call-files-bei.patch b/0011-This-fixes-the-inotify-code-to-handle-call-files-bei.patch
index c79c234..5a6fa16 100644
--- a/0011-This-fixes-the-inotify-code-to-handle-call-files-bei.patch
+++ b/0011-This-fixes-the-inotify-code-to-handle-call-files-bei.patch
@@ -1,7 +1,7 @@
From 7ee9833fa5ad62c5ce3584d9ff3262a7731796b8 Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2 at infradead.org>
Date: Tue, 20 Sep 2011 09:19:22 -0500
-Subject: [PATCH 11/13] This fixes the inotify code to handle call files being
+Subject: [PATCH 11/14] This fixes the inotify code to handle call files being
hardlinked into the spool directory.
The smsq utility does this, instead of rename(), to ensure that it
diff --git a/0012-Fix-two-problems-with-app_sms.patch b/0012-Fix-two-problems-with-app_sms.patch
index bae257d..138c40d 100644
--- a/0012-Fix-two-problems-with-app_sms.patch
+++ b/0012-Fix-two-problems-with-app_sms.patch
@@ -1,7 +1,7 @@
From 4401cf3bcf07723bf30724f76074942eb7aaa7be Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2 at infradead.org>
Date: Tue, 20 Sep 2011 09:21:47 -0500
-Subject: [PATCH 12/13] Fix two problems with app_sms.
+Subject: [PATCH 12/14] Fix two problems with app_sms.
Firstly, the 'flags' field on the stack in sms_exec() is
uninitialised, causing it to use the wrong protocol in some cases.
diff --git a/0013-Remove-blank-lines-to-improve-compat-with-389-Direct.patch b/0013-Remove-blank-lines-to-improve-compat-with-389-Direct.patch
index 3dafa11..5b2af11 100644
--- a/0013-Remove-blank-lines-to-improve-compat-with-389-Direct.patch
+++ b/0013-Remove-blank-lines-to-improve-compat-with-389-Direct.patch
@@ -1,7 +1,7 @@
From 0ee8123802c0dbc4b0d4837d1941df9299abf1a5 Mon Sep 17 00:00:00 2001
From: "Jeffrey C. Ollie" <jeff at ocjtech.us>
Date: Tue, 20 Sep 2011 10:21:04 -0500
-Subject: [PATCH 13/13] Remove blank lines to improve compat with 389
+Subject: [PATCH 13/14] Remove blank lines to improve compat with 389
Directory Server
---
diff --git a/0014-Comment-out-the-config-in-res_pktccops.conf-for-extr.patch b/0014-Comment-out-the-config-in-res_pktccops.conf-for-extr.patch
new file mode 100644
index 0000000..0661aa5
--- /dev/null
+++ b/0014-Comment-out-the-config-in-res_pktccops.conf-for-extr.patch
@@ -0,0 +1,80 @@
+From d05e88098b8a38b79fdc95650b144a81d23479eb Mon Sep 17 00:00:00 2001
+From: "Jeffrey C. Ollie" <jeff at ocjtech.us>
+Date: Tue, 20 Sep 2011 11:52:03 -0500
+Subject: [PATCH 14/14] Comment out the config in res_pktccops.conf for extra
+ safety
+
+---
+ configs/res_pktccops.conf.sample | 61 ++++++++++++++++++-------------------
+ 1 files changed, 30 insertions(+), 31 deletions(-)
+
+diff --git a/configs/res_pktccops.conf.sample b/configs/res_pktccops.conf.sample
+index 3d61808..3a4c836 100644
+--- a/configs/res_pktccops.conf.sample
++++ b/configs/res_pktccops.conf.sample
+@@ -1,32 +1,31 @@
+ ; Sample res_pktccops.conf
+-
+-[general]
+-gateinfoperiod => 60 ; default 60s
+-gatetimeout = 150 ; default 150
+-t1 => 250 ; default 250s
+-t7 => 200 ; default 200s
+-t8 => 300 ; default 300s
+-keepalive => 60 ; default 60s
+-
+-[teszt]
+-host => 192.168.0.24
+-pool => 10.0.1.0 10.0.1.255
+-pool => 10.0.3.0 10.0.3.255
+-pool => 10.0.7.0 10.0.8.255
+-pool => 10.0.10.0 10.0.11.255
+-
+-[general]
+-gateinfoperiod => 60 ; default 60s
+-gatetimeout = 150 ; default 150
+-t1 => 250 ; default 250s
+-t7 => 200 ; default 200s
+-t8 => 300 ; default 300s
+-keepalive => 60 ; default 60s
+-
+-[test]
+-host => 192.168.0.24
+-pool => 10.0.1.0 10.0.1.255
+-pool => 10.0.3.0 10.0.3.255
+-pool => 10.0.7.0 10.0.8.255
+-pool => 10.0.10.0 10.0.11.255
+-
++;
++;[general]
++;gateinfoperiod => 60 ; default 60s
++;gatetimeout = 150 ; default 150
++;t1 => 250 ; default 250s
++;t7 => 200 ; default 200s
++;t8 => 300 ; default 300s
++;keepalive => 60 ; default 60s
++;
++;[teszt]
++;host => 192.168.0.24
++;pool => 10.0.1.0 10.0.1.255
++;pool => 10.0.3.0 10.0.3.255
++;pool => 10.0.7.0 10.0.8.255
++;pool => 10.0.10.0 10.0.11.255
++;
++;[general]
++;gateinfoperiod => 60 ; default 60s
++;gatetimeout = 150 ; default 150
++;t1 => 250 ; default 250s
++;t7 => 200 ; default 200s
++;t8 => 300 ; default 300s
++;keepalive => 60 ; default 60s
++;
++;[test]
++;host => 192.168.0.24
++;pool => 10.0.1.0 10.0.1.255
++;pool => 10.0.3.0 10.0.3.255
++;pool => 10.0.7.0 10.0.8.255
++;pool => 10.0.10.0 10.0.11.255
+--
+1.7.6.2
+
diff --git a/asterisk.spec b/asterisk.spec
index b807b92..80363ed 100644
--- a/asterisk.spec
+++ b/asterisk.spec
@@ -18,7 +18,7 @@
Summary: The Open Source PBX
Name: asterisk
Version: 1.8.6.0
-Release: 3%{?_rc:.rc%{_rc}}%{?_beta:.beta%{_beta}}%{?dist}
+Release: 4%{?_rc:.rc%{_rc}}%{?_beta:.beta%{_beta}}%{?dist}
License: GPLv2
Group: Applications/Internet
URL: http://www.asterisk.org/
@@ -46,6 +46,7 @@ Patch10: 0010-Make-sure-that-the-Fedora-init-script-can-find-the-p.patch
Patch11: 0011-This-fixes-the-inotify-code-to-handle-call-files-bei.patch
Patch12: 0012-Fix-two-problems-with-app_sms.patch
Patch13: 0013-Remove-blank-lines-to-improve-compat-with-389-Direct.patch
+Patch14: 0014-Comment-out-the-config-in-res_pktccops.conf-for-extr.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
@@ -481,6 +482,7 @@ local filesystem.
%patch11 -p1
%patch12 -p1
%patch13 -p1
+%patch14 -p1
cp %{S:3} menuselect.makedeps
cp %{S:4} menuselect.makeopts
@@ -1267,6 +1269,12 @@ fi
%{_libdir}/asterisk/modules/app_voicemail_plain.so
%changelog
+* Tue Sep 20 2011 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.8.6.0-4
+- Add additional patch for res_pktccops.
+
+* Tue Sep 20 2011 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.8.6.0-3
+- Add patch to fix compatibility with 389 directory server.
+
* Tue Sep 20 2011 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.8.6.0-2
- Add patches to fix many bug reports from bugzilla.
More information about the scm-commits
mailing list