rpms/asterisk/F-8 asterisk-1.4.16-1.4.16.1-update.patch, NONE, 1.1 asterisk.spec, 1.3, 1.4

[Jeffrey C. Ollie (jcollie)]

Author: jcollie

Update of /cvs/pkgs/rpms/asterisk/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32560

Modified Files:
	asterisk.spec 
Added Files:
	asterisk-1.4.16-1.4.16.1-update.patch 
Log Message:
Add patch to fix some crasher bugs introduced in 1.4.16

asterisk-1.4.16-1.4.16.1-update.patch:

--- NEW FILE asterisk-1.4.16-1.4.16.1-update.patch ---
diff --git a/.version b/.version
index 6ee81ab..ee8d608 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-1.4.16
+1.4.16.1
diff --git a/ChangeLog b/ChangeLog
index 7c8e2cd..d9c8a1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2007-12-19  Russell Bryant <russell at digium.com>
+
+	* Asterisk 1.4.16.1 released.
+
+2007-12-19 17:29 +0000 [r93955]  Joshua Colp <jcolp at digium.com>
+
+	* channels/chan_iax2.c: Make the 1.4 builders happy, ensure var is
+	  NULL.
+
+2007-12-19 17:04 +0000 [r93949]  Tilghman Lesher <tlesher at digium.com>
+
+	* channels/chan_iax2.c: Avoid segfault in chan_iax when peer isn't
+	  defined (Closes issue #11602)
+
+2007-12-18 22:42 +0000 [r93764]  Jason Parker <jparker at digium.com>
+
+	* channels/chan_skinny.c: FreeBSD also does not have byte swap
+	  functions. Issue 11586, patch by sobomax.
+
 2007-12-18  Russell Bryant <russell at digium.com>
 
 	* Asterisk 1.4.16 released.
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 75ac2df..1e09d55 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -2674,7 +2674,7 @@ static int iax2_fixup(struct ast_channel *oldchannel, struct ast_channel *newcha
  */
 static struct iax2_peer *realtime_peer(const char *peername, struct sockaddr_in *sin)
 {
-	struct ast_variable *var;
+	struct ast_variable *var = NULL;
 	struct ast_variable *tmp;
 	struct iax2_peer *peer=NULL;
 	time_t regseconds = 0, nowtime;
@@ -2696,7 +2696,7 @@ static struct iax2_peer *realtime_peer(const char *peername, struct sockaddr_in
 			}
 		}
 	}
-	if (!var) { /* Last ditch effort */
+	if (!var && peername) { /* Last ditch effort */
 		var = ast_load_realtime("iaxpeers", "name", peername, NULL);
 		/*!\note
 		 * If this one loaded something, then we need to ensure that the host
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index 60566c4..9508906 100644
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -107,7 +107,7 @@ static char version_id[16] = "P002F202";
 #define htolel(x) (x)
 #define htoles(x) (x)
 #else
-#if defined(SOLARIS) || defined(__Darwin__) || defined(__NetBSD__) || defined(__OpenBSD__)
+#if defined(SOLARIS) || defined(__Darwin__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
 #define __bswap_16(x) \
 	((((x) & 0xff00) >> 8) | \
 	 (((x) & 0x00ff) << 8))


Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-8/asterisk.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- asterisk.spec	19 Dec 2007 05:32:53 -0000	1.3
+++ asterisk.spec	19 Dec 2007 19:15:20 -0000	1.4
@@ -3,7 +3,7 @@
 Summary: The Open Source PBX
 Name: asterisk
 Version: 1.4.16
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -44,6 +44,7 @@
 Patch8:  asterisk-1.4.16-libcap.patch
 Patch9:  asterisk-1.4.16-chanmobile.patch
 Patch10: asterisk-1.4.16-autoconf.patch
+Patch11: asterisk-1.4.16-1.4.16.1-update.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
@@ -321,6 +322,7 @@
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 cp %{SOURCE2} menuselect.makedeps
 cp %{SOURCE3} menuselect.makeopts
@@ -876,6 +878,10 @@
 %{_libdir}/asterisk/modules/codec_zap.so
 
 %changelog
+* Wed Dec 19 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.16-2
+- Add patch to bring source up to version 1.4.16.1 which will be
+  released shortly to fix some crasher bugs introduced by 1.4.16.
+
 * Tue Dec 18 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.16-1
 - Update to 1.4.16 to fix security bug.