diff --git a/.cvsignore b/.cvsignore index 5801a45..a114d2f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -asterisk-1.4.16-stripped.tar.gz +asterisk-1.4.16.1-stripped.tar.gz diff --git a/asterisk-1.4.16-1.4.16.1-update.patch b/asterisk-1.4.16-1.4.16.1-update.patch deleted file mode 100644 index ed3bd02..0000000 --- a/asterisk-1.4.16-1.4.16.1-update.patch +++ /dev/null @@ -1,69 +0,0 @@ -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 -+ -+ * Asterisk 1.4.16.1 released. -+ -+2007-12-19 17:29 +0000 [r93955] Joshua Colp -+ -+ * channels/chan_iax2.c: Make the 1.4 builders happy, ensure var is -+ NULL. -+ -+2007-12-19 17:04 +0000 [r93949] Tilghman Lesher -+ -+ * 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 -+ -+ * channels/chan_skinny.c: FreeBSD also does not have byte swap -+ functions. Issue 11586, patch by sobomax. -+ - 2007-12-18 Russell Bryant - - * 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)) diff --git a/asterisk.spec b/asterisk.spec index 67bd68c..502d2cb 100644 --- a/asterisk.spec +++ b/asterisk.spec @@ -2,8 +2,8 @@ Summary: The Open Source PBX Name: asterisk -Version: 1.4.16 -Release: 2%{?dist} +Version: 1.4.16.1 +Release: 1%{?dist} License: GPLv2 Group: Applications/Internet URL: http://www.asterisk.org/ @@ -20,13 +20,13 @@ ExcludeArch: ppc64 # # MD5 Sums # ======== -# 2bc92ed77ba1dede35da744cca046ac0 asterisk-1.4.16.tar.gz -# 76a17563c4f6e3cc7b4457377db0b85b asterisk-1.4.16-stripped.tar.gz +# 1b58b2a48bc65f651b66a2d1dbfc3cc3 asterisk-1.4.16.1.tar.gz +# 3162a3a2d90d1883e16bb5f0b552a9fd asterisk-1.4.16.1-stripped.tar.gz # # SHA1 Sums # ========= -# 996ef122e2cd11a348c6679133019b664a8535ee asterisk-1.4.16.tar.gz -# e4ec1416016dc757ad8a6aad3eeefc49b4d0e76c asterisk-1.4.16-stripped.tar.gz +# 0ad6a4c6ec49ac7b8f204798fb7bde7cb624cdc6 asterisk-1.4.16.1.tar.gz +# 76a2d5bf407a0d48eb9b5a3543a0624b069eb3b1 asterisk-1.4.16.1-stripped.tar.gz Source0: asterisk-%{version}-stripped.tar.gz Source1: asterisk-logrotate @@ -44,7 +44,6 @@ Patch7: asterisk-1.4.16-optimization.patch 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) @@ -322,7 +321,6 @@ Modules for Asterisk that use Zaptel. %patch8 -p1 %patch9 -p1 %patch10 -p1 -%patch11 -p1 cp %{SOURCE2} menuselect.makedeps cp %{SOURCE3} menuselect.makeopts @@ -878,6 +876,9 @@ fi %{_libdir}/asterisk/modules/codec_zap.so %changelog +* Wed Dec 19 2007 Jeffrey C. Ollie - 1.4.16.1-1 +- Update to the real 1.4.16.1. + * Wed Dec 19 2007 Jeffrey C. Ollie - 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. diff --git a/sources b/sources index 288e791..df67f0c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -76a17563c4f6e3cc7b4457377db0b85b asterisk-1.4.16-stripped.tar.gz +3162a3a2d90d1883e16bb5f0b552a9fd asterisk-1.4.16.1-stripped.tar.gz