rpms/asterisk/F-10 .cvsignore, 1.20, 1.21 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch, 1.8, 1.9 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch, 1.7, 1.8 asterisk-strip.sh, 1.4, 1.5 asterisk.spec, 1.44, 1.45 sources, 1.20, 1.21 0005-Add-chan_mobile-from-asterisk-addons.patch, 1.7, NONE 0006-Use-pkgconfig-to-check-for-Lua.patch, 1.7, NONE 0007-Build-using-external-libedit.patch, 1.7, NONE 0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch, 1.4, NONE 0011-Merged-revisions-160170-160172-via-svnmerge-from.patch, 1.4, NONE 0012-Merged-revisions-162275-via-svnmerge-from.patch, 1.3, NONE 0013-Update-autoconf.patch, 1.3, NONE 0016-Fix-a-reversed-logic-ast_strlen_zero.patch, 1.1, NONE
Jeffrey C. Ollie
jcollie at fedoraproject.org
Fri Sep 4 03:14:10 UTC 2009
- Previous message (by thread): rpms/gbirthday/EL-5 gbirthday.spec,NONE,1.1 sources,1.1,1.2
- Next message (by thread): rpms/gramps/F-11 .cvsignore, 1.27, 1.28 gramps.spec, 1.46, 1.47 sources, 1.27, 1.28
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jcollie
Update of /cvs/pkgs/rpms/asterisk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14457
Modified Files:
.cvsignore
0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch
asterisk-strip.sh asterisk.spec sources
Removed Files:
0005-Add-chan_mobile-from-asterisk-addons.patch
0006-Use-pkgconfig-to-check-for-Lua.patch
0007-Build-using-external-libedit.patch
0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch
0011-Merged-revisions-160170-160172-via-svnmerge-from.patch
0012-Merged-revisions-162275-via-svnmerge-from.patch
0013-Update-autoconf.patch
0016-Fix-a-reversed-logic-ast_strlen_zero.patch
Log Message:
* Thu Sep 3 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.15-1
- Drop chan_mobile, too difficult to maintain as a patch
- Update to 1.6.0.15 and drop unneeded patches
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore 23 Jan 2009 22:30:35 -0000 1.20
+++ .cvsignore 4 Sep 2009 03:14:09 -0000 1.21
@@ -1 +1,3 @@
-asterisk-1.6.0.5-stripped.tar.gz
+asterisk-1.6.0.15-stripped.tar.gz
+asterisk-1.6.0.15.tar.gz.asc
+asterisk-developer-pubring.gpg
0002-Modify-modules.conf-so-that-different-voicemail-modu.patch:
modules.conf.sample | 28 +++++++++++++++++++++++++++-
1 file changed, 27 insertions(+), 1 deletion(-)
Index: 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0002-Modify-modules.conf-so-that-different-voicemail-modu.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch 5 Jan 2009 03:10:28 -0000 1.8
+++ 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch 4 Sep 2009 03:14:09 -0000 1.9
@@ -1,20 +1,13 @@
-From 42cd072beba88049783a7bedb029760a5952706e Mon Sep 17 00:00:00 2001
-From: Jeffrey C. Ollie <jcollie at pc21224.campus.dmacc.edu>
-Date: Thu, 8 Nov 2007 15:52:36 -0600
-Subject: [PATCH 02/15] Modify modules.conf so that different voicemail modules can be loaded.
-
----
- configs/modules.conf.sample | 27 +++++++++++++++++++++++++++
- 1 files changed, 27 insertions(+), 0 deletions(-)
-
-diff --git a/configs/modules.conf.sample b/configs/modules.conf.sample
-index 2ca3c03..ae20637 100644
---- a/configs/modules.conf.sample
-+++ b/configs/modules.conf.sample
-@@ -37,3 +37,30 @@ load => res_musiconhold.so
+Index: configs/modules.conf.sample
+===================================================================
+--- configs/modules.conf.sample (revision 216221)
++++ configs/modules.conf.sample (working copy)
+@@ -36,4 +36,30 @@
+ ;
noload => chan_alsa.so
;noload => chan_oss.so
- ;noload => chan_console.so
+-noload => chan_console.so
++;noload => chan_console.so
+
+;
+; Voicemail storage selection
@@ -41,7 +34,3 @@ index 2ca3c03..ae20637 100644
+;
+;noload => app_directory_plain.so
+;noload => app_voicemail_plain.so
-+
---
-1.6.1
-
0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch:
Makefile | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
Index: 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch 5 Jan 2009 03:10:28 -0000 1.7
+++ 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch 4 Sep 2009 03:14:09 -0000 1.8
@@ -1,53 +1,17 @@
-From 42991016984f9e7930686527706ab0f36baa41d1 Mon Sep 17 00:00:00 2001
-From: tilghman <tilghman at 614ede4d-c843-0410-af14-a771ab80d22e>
-Date: Tue, 29 Jul 2008 23:00:45 +0000
-Subject: [PATCH 04/15] Minor changes to reduce packaging changes made by the Fedora maintainer.
- (closes issue #12974)
- Reported by: jcollie
- Patches:
- 0001-Don-t-override-duplicate-optimization-flags.patch uploaded by jcollie (license 412)
-
-git-svn-id: http://svn.digium.com/svn/asterisk/trunk@134312 614ede4d-c843-0410-af14-a771ab80d22e
----
- Makefile | 16 ++++++++++++----
- 1 files changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 788e524..05a58d1 100644
---- a/Makefile
-+++ b/Makefile
-@@ -222,10 +222,16 @@ ifeq ($(OSARCH),linux-gnu)
- endif
-
- ifeq ($(findstring -save-temps,$(ASTCFLAGS)),)
--ASTCFLAGS+=-pipe
-+ ifeq ($(findstring -pipe,$(ASTCFLAGS)),)
-+ ASTCFLAGS+=-pipe
-+ endif
-+endif
-+
-+ifeq ($(findstring -Wall,$(ASTCFLAGS)),)
-+ ASTCFLAGS+=-Wall
- endif
-
--ASTCFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
-+ASTCFLAGS+=-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
-
- ifeq ($(AST_DEVMODE),yes)
- ASTCFLAGS+=-Werror
-@@ -242,8 +248,10 @@ ifneq ($(findstring BSD,$(OSARCH)),)
- ASTLDFLAGS+=-L/usr/local/lib
+Index: Makefile
+===================================================================
+--- Makefile (revision 216221)
++++ Makefile (working copy)
+@@ -241,8 +241,10 @@
+ _ASTCFLAGS+=-isystem /usr/local/include
endif
-ifneq ($(PROC),ultrasparc)
-- ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
-+ifeq ($(findstring -march,$(ASTCFLAGS)),)
+- _ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
++ifeq ($(findstring -march,$(_ASTCFLAGS)),)
+ ifneq ($(PROC),ultrasparc)
-+ ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
++ _ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
+ endif
endif
ifeq ($(PROC),ppc)
---
-1.6.1
-
Index: asterisk-strip.sh
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/asterisk-strip.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- asterisk-strip.sh 10 Oct 2008 17:16:34 -0000 1.4
+++ asterisk-strip.sh 4 Sep 2009 03:14:10 -0000 1.5
@@ -1,11 +1,45 @@
#!/bin/sh
version=$1
+
+if [ -z $version ]; then
+ echo "Please specify a version!"
+ exit 1
+fi
+
+wget --continue --timestamping http://downloads.digium.com/pub/telephony/asterisk/releases/asterisk-$version.tar.gz \
+ http://downloads.digium.com/pub/telephony/asterisk/releases/asterisk-$version.tar.gz.asc
+
+if [ ! $? ]; then
+ echo "Unable to download!"
+ exit 1
+fi
+
if [ ! -f asterisk-$version.tar.gz ]; then
echo "Can't find asterisk-$version.tar.gz!"
exit 1
fi
+if [ ! -f asterisk-$version.tar.gz.asc ]; then
+ echo "Can't find asterisk-$version.tar.gz.asc!"
+ exit 1
+fi
+
+gpg --keyring=$(pwd)/asterisk-developer-pubring.gpg --verify asterisk-$version.tar.gz.asc asterisk-$version.tar.gz
+
+if [ ! $? ]; then
+ echo "Bad signature!!!!"
+ exit 1
+fi
+
+echo
+read -p "Does the GPG signature look OK? " -n 1
+echo
+
+if [ $REPLY != "Y" -a $REPLY != "y" ]; then
+ exit 1
+fi
+
tar xf asterisk-$version.tar.gz
rm asterisk-$version/sounds/*.tar.gz
tar czf asterisk-$version-stripped.tar.gz asterisk-$version
@@ -18,5 +52,9 @@ echo "#"
echo "# SHA1 Sums"
echo "# ========="
sha1sum asterisk-$version.tar.gz asterisk-$version-stripped.tar.gz | sed -e 's/^/# /'
+echo "#"
+echo "# SHA256 Sums"
+echo "# ========="
+sha256sum asterisk-$version.tar.gz asterisk-$version-stripped.tar.gz | sed -e 's/^/# /'
-
+make new-sources FILES="asterisk-$version-stripped.tar.gz asterisk-$version.tar.gz.asc asterisk-developer-pubring.gpg"
Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/asterisk.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- asterisk.spec 24 Jan 2009 03:16:32 -0000 1.44
+++ asterisk.spec 4 Sep 2009 03:14:10 -0000 1.45
@@ -2,8 +2,8 @@
Summary: The Open Source PBX
Name: asterisk
-Version: 1.6.0.5
-Release: 2%{?dist}
+Version: 1.6.0.15
+Release: 1%{?dist}
License: GPLv2
Group: Applications/Internet
URL: http://www.asterisk.org/
@@ -19,13 +19,18 @@ URL: http://www.asterisk.org/
# MD5 Sums
# ========
-# 11210cf7c59cde03d928743e71fcb556 asterisk-1.6.0.5.tar.gz
-# 29bdc7428266b75aac77d66acd8c88a0 asterisk-1.6.0.5-stripped.tar.gz
+# d319f52d8d1d70f69583901e56720c30 asterisk-1.6.0.15.tar.gz
+# 99f689457465e013f3402dfe029967ee asterisk-1.6.0.15-stripped.tar.gz
#
# SHA1 Sums
# =========
-# f2a2cd9be274dc4a7e6001f877197863b4ba8e15 asterisk-1.6.0.5.tar.gz
-# 25b92e9675d72c784018bddf0ddb458cab9e4185 asterisk-1.6.0.5-stripped.tar.gz
+# 31b2ad242d103cef7509e0fae4f31eb0b00a855e asterisk-1.6.0.15.tar.gz
+# 1326c6ab27b22dc447905293b54b1f1af2f91c18 asterisk-1.6.0.15-stripped.tar.gz
+#
+# SHA256 Sums
+# =========
+# 159bf2c39ed2926d97f535c8d46bcf6c80853bab1269d596241c6ed30b27b92a asterisk-1.6.0.15.tar.gz
+# 823ff57f5ae10e5ff5ca711ab52d0bc30148e94d1ef9f80de499d8ce28520242 asterisk-1.6.0.15-stripped.tar.gz
Source0: asterisk-%{version}-stripped.tar.gz
Source1: asterisk-logrotate
@@ -37,22 +42,15 @@ Patch1: 0001-Modify-init-scripts-for-be
Patch2: 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
Patch3: 0003-Allow-alternate-extensions-to-be-specified-in-users.patch
Patch4: 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch
-Patch5: 0005-Add-chan_mobile-from-asterisk-addons.patch
-Patch6: 0006-Use-pkgconfig-to-check-for-Lua.patch
-Patch7: 0007-Build-using-external-libedit.patch
Patch8: 0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch
Patch9: 0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch
-Patch10: 0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch
-Patch12: 0012-Merged-revisions-162275-via-svnmerge-from.patch
-Patch13: 0013-Update-autoconf.patch
Patch14: 0014-Fix-up-some-paths.patch
Patch15: 0015-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
-Patch16: 0016-Fix-a-reversed-logic-ast_strlen_zero.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
-#BuildRequires: autoconf
-#BuildRequires: automake
+BuildRequires: autoconf
+BuildRequires: automake
# core build requirements
BuildRequires: openssl-devel
@@ -81,9 +79,6 @@ BuildRequires: libvorbis-devel
# codec_gsm
BuildRequires: gsm-devel
-# cli
-BuildRequires: libedit-devel
-
Requires(pre): %{_sbindir}/useradd
Requires(pre): %{_sbindir}/groupadd
Requires(post): /sbin/chkconfig
@@ -93,6 +88,9 @@ Requires(preun): /sbin/service
# asterisk-conference package removed since patch no longer compiles
Obsoletes: asterisk-conference <= 1.6.0-0.14.beta9
+# we are dropping the chan_mobile patch
+Obsoletes: asterisk-mobile <= 1.6.0.5-2
+
%description
Asterisk is a complete PBX in software. It runs on Linux and provides
all of the features you would expect from a PBX and more. Asterisk
@@ -264,15 +262,15 @@ Requires: asterisk = %{version}-%{releas
%description minivm
MiniVM application for Asterisk.
-%package mobile
-Summary: Asterisk channel driver for bluetooth phones and headsets
-Group: Applications/Internet
-Requires: asterisk = %{version}-%{release}
-BuildRequires: bluez-libs-devel
-
-%description mobile
-Asterisk channel driver to allow Bluetooth cell/mobile phones to be
-used as FXO devices, and headsets as FXS devices.
+#%package mobile
+#Summary: Asterisk channel driver for bluetooth phones and headsets
+#Group: Applications/Internet
+#Requires: asterisk = %{version}-%{release}
+#BuildRequires: bluez-libs-devel
+#
+#%description mobile
+#Asterisk channel driver to allow Bluetooth cell/mobile phones to be
+#used as FXO devices, and headsets as FXS devices.
%package odbc
Summary: Applications for Asterisk that use ODBC (except voicemail)
@@ -423,20 +421,13 @@ local filesystem.
%prep
%setup0 -q
%patch1 -p1
-%patch2 -p1
+%patch2 -p0
%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
+%patch4 -p0
%patch8 -p1
%patch9 -p1
-%patch10 -p1
-%patch12 -p1
-%patch13 -p1
%patch14 -p1
%patch15 -p1
-%patch16 -p1
cp %{SOURCE2} menuselect.makedeps
cp %{SOURCE3} menuselect.makeopts
@@ -699,6 +690,7 @@ fi
%{_libdir}/asterisk/modules/format_vox.so
%{_libdir}/asterisk/modules/format_wav_gsm.so
%{_libdir}/asterisk/modules/format_wav.so
+%{_libdir}/asterisk/modules/func_audiohookinherit.so
%{_libdir}/asterisk/modules/func_base64.so
%{_libdir}/asterisk/modules/func_blacklist.so
%{_libdir}/asterisk/modules/func_callerid.so
@@ -751,14 +743,14 @@ fi
%{_libdir}/asterisk/modules/res_smdi.so
%{_libdir}/asterisk/modules/res_speech.so
-#%{_sbindir}/aelparse
+%{_sbindir}/aelparse
%{_sbindir}/astcanary
%{_sbindir}/asterisk
%{_sbindir}/astgenkey
%{_sbindir}/astman
%{_sbindir}/autosupport
-%{_sbindir}/check_expr
-#%{_sbindir}/conf2ael
+#%{_sbindir}/check_expr
+%{_sbindir}/conf2ael
%{_sbindir}/muted
%{_sbindir}/rasterisk
%{_sbindir}/safe_asterisk
@@ -956,11 +948,11 @@ fi
%config(noreplace) %{_sysconfdir}/asterisk/misdn.conf
%{_libdir}/asterisk/modules/chan_misdn.so
-%files mobile
-%defattr(-,root,root,-)
-%doc doc/chan_mobile.txt
-%config(noreplace) %{_sysconfdir}/asterisk/mobile.conf
-%{_libdir}/asterisk/modules/chan_mobile.so
+#%files mobile
+#%defattr(-,root,root,-)
+#%doc doc/chan_mobile.txt
+#%config(noreplace) %{_sysconfdir}/asterisk/mobile.conf
+#%{_libdir}/asterisk/modules/chan_mobile.so
%files odbc
%defattr(-,root,root,-)
@@ -1054,6 +1046,10 @@ fi
%{_libdir}/asterisk/modules/app_voicemail_plain.so
%changelog
+* Thu Sep 3 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.15-1
+- Drop chan_mobile, too difficult to maintain as a patch
+- Update to 1.6.0.15 and drop unneeded patches
+
* Fri Jan 23 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.5-2
- Add a patch to fix a problem with the manager interface.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources 23 Jan 2009 22:30:35 -0000 1.20
+++ sources 4 Sep 2009 03:14:10 -0000 1.21
@@ -1 +1,3 @@
-29bdc7428266b75aac77d66acd8c88a0 asterisk-1.6.0.5-stripped.tar.gz
+99f689457465e013f3402dfe029967ee asterisk-1.6.0.15-stripped.tar.gz
+050fc71eae387ee71d751fb53a060a78 asterisk-1.6.0.15.tar.gz.asc
+4c2feab99acb254a49048b93da97ad42 asterisk-developer-pubring.gpg
--- 0005-Add-chan_mobile-from-asterisk-addons.patch DELETED ---
--- 0006-Use-pkgconfig-to-check-for-Lua.patch DELETED ---
--- 0007-Build-using-external-libedit.patch DELETED ---
--- 0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch DELETED ---
--- 0011-Merged-revisions-160170-160172-via-svnmerge-from.patch DELETED ---
--- 0012-Merged-revisions-162275-via-svnmerge-from.patch DELETED ---
--- 0013-Update-autoconf.patch DELETED ---
--- 0016-Fix-a-reversed-logic-ast_strlen_zero.patch DELETED ---
- Previous message (by thread): rpms/gbirthday/EL-5 gbirthday.spec,NONE,1.1 sources,1.1,1.2
- Next message (by thread): rpms/gramps/F-11 .cvsignore, 1.27, 1.28 gramps.spec, 1.46, 1.47 sources, 1.27, 1.28
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list