[Pkg-voip-commits] r5106 - in /asterisk/trunk/debian: changelog patches/disable-build-sum patches/hack-multiple-app-voicemail patches/series patches/silence-buildsum-warning patches/use-libpri-bristuffed
paravoid at alioth.debian.org
paravoid at alioth.debian.org
Thu Dec 20 05:17:48 UTC 2007
Author: paravoid
Date: Thu Dec 20 05:17:47 2007
New Revision: 5106
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5106
Log:
* New upstream release (Fixes CVE-2007-6430)
- Remove keep-1.4-abi, merged upstream.
- Adapt hack-multiple-app-voicemail, use-libpri-bristuffed.
* Silence upstream's build sum warning but generate one on all modules so
that we can enable it at a later point.
Added:
asterisk/trunk/debian/patches/silence-buildsum-warning
Removed:
asterisk/trunk/debian/patches/disable-build-sum
Modified:
asterisk/trunk/debian/changelog
asterisk/trunk/debian/patches/hack-multiple-app-voicemail
asterisk/trunk/debian/patches/series
asterisk/trunk/debian/patches/use-libpri-bristuffed
Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=5106&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Thu Dec 20 05:17:47 2007
@@ -1,10 +1,14 @@
asterisk (1:1.4.16~dfsg-1) UNRELEASED; urgency=low
* NOT RELEASED YET
- * New upstream release.
+ * New upstream release (Fixes CVE-2007-6430)
+ - Remove keep-1.4-abi, merged upstream.
+ - Adapt hack-multiple-app-voicemail, use-libpri-bristuffed.
+ * Silence upstream's build sum warning but generate one on all modules so
+ that we can enable it at a later point.
* Make the init script's detection of a running daemon to be more precise.
- -- Faidon Liambotis <paravoid at debian.org> Tue, 18 Dec 2007 23:02:42 +0200
+ -- Faidon Liambotis <paravoid at debian.org> Thu, 20 Dec 2007 07:17:03 +0200
asterisk (1:1.4.15~dfsg-1) unstable; urgency=low
Modified: asterisk/trunk/debian/patches/hack-multiple-app-voicemail
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/hack-multiple-app-voicemail?rev=5106&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/hack-multiple-app-voicemail (original)
+++ asterisk/trunk/debian/patches/hack-multiple-app-voicemail Thu Dec 20 05:17:47 2007
@@ -14,10 +14,10 @@
--- a/apps/Makefile
+++ b/apps/Makefile
-@@ -12,6 +12,16 @@
- -include ../menuselect.makeopts ../menuselect.makedeps
+@@ -18,6 +18,16 @@ ALL_C_MODS:=$(patsubst %.c,%,$(wildcard
+ ALL_CC_MODS:=$(patsubst %.cc,%,$(wildcard app_*.cc))
- C_MODS:=$(filter-out $(MENUSELECT_APPS),$(patsubst %.c,%,$(wildcard app_*.c)))
+ C_MODS:=$(filter-out $(MENUSELECT_APPS),$(ALL_C_MODS))
+ifeq ($(findstring IMAP_STORAGE,$(MENUSELECT_OPTS_app_voicemail)),)
+C_MODS+=app_voicemail_imap
+MENUSELECT_DEPENDS_app_voicemail_imap+=IMAP_TK SSL
@@ -28,10 +28,10 @@
+MENUSELECT_DEPENDS_app_voicemail_odbc+=UNIXODBC LTDL
+MENUSELECT_DEPENDS_app_directory_odbc+=UNIXODBC LTDL
+endif
- CC_MODS:=$(filter-out $(MENUSELECT_APPS),$(patsubst %.cc,%,$(wildcard app_*.cc)))
+ CC_MODS:=$(filter-out $(MENUSELECT_APPS),$(ALL_CC_MODS))
LOADABLE_MODS:=$(C_MODS) $(CC_MODS)
-@@ -22,6 +32,8 @@ ifneq ($(findstring apps,$(MENUSELECT_EM
+@@ -28,6 +38,8 @@ ifneq ($(findstring apps,$(MENUSELECT_EM
endif
MENUSELECT_OPTS_app_directory:=$(MENUSELECT_OPTS_app_voicemail)
@@ -40,7 +40,7 @@
ifneq ($(findstring ODBC_STORAGE,$(MENUSELECT_OPTS_app_voicemail)),)
MENUSELECT_DEPENDS_app_voicemail+=$(MENUSELECT_DEPENDS_ODBC_STORAGE)
MENUSELECT_DEPENDS_app_directory+=$(MENUSELECT_DEPENDS_ODBC_STORAGE)
-@@ -38,4 +50,17 @@ endif
+@@ -44,4 +56,17 @@ endif
all: _all
Modified: asterisk/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/series?rev=5106&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/series (original)
+++ asterisk/trunk/debian/patches/series Thu Dec 20 05:17:47 2007
@@ -1,7 +1,6 @@
# upstream fixes
debian-banner
-keep-1.4-abi
-disable-build-sum
+silence-buildsum-warning
configure-libc-client
hack-multiple-app-voicemail
astvarrundir
Added: asterisk/trunk/debian/patches/silence-buildsum-warning
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/silence-buildsum-warning?rev=5106&op=file
==============================================================================
--- asterisk/trunk/debian/patches/silence-buildsum-warning (added)
+++ asterisk/trunk/debian/patches/silence-buildsum-warning Thu Dec 20 05:17:47 2007
@@ -1,0 +1,18 @@
+Several of our modules were compiled before build sum was introduced.
+Avoid annoying our users for now. We will enable this option at a later point
+when most of the modules will get a compilation with the new headers.
+
+ -- Faidon Liambotis <paravoid at debian.org>
+
+--- a/main/loader.c
++++ b/main/loader.c
+@@ -617,7 +617,9 @@ static unsigned int inspect_module(const
+ }
+
+ if (!ast_test_flag(mod->info, AST_MODFLAG_BUILDSUM)) {
++ /*
+ ast_log(LOG_WARNING, "Module '%s' was not compiled against a recent version of Asterisk and may cause instability.\n", mod->resource);
++ */
+ } else if (!ast_strlen_zero(mod->info->buildopt_sum) &&
+ strcmp(buildopt_sum, mod->info->buildopt_sum)) {
+ ast_log(LOG_WARNING, "Module '%s' was not compiled with the same compile-time options as this version of Asterisk.\n", mod->resource);
Modified: asterisk/trunk/debian/patches/use-libpri-bristuffed
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/use-libpri-bristuffed?rev=5106&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/use-libpri-bristuffed (original)
+++ asterisk/trunk/debian/patches/use-libpri-bristuffed Thu Dec 20 05:17:47 2007
@@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
-@@ -24903,18 +24903,18 @@ fi
+@@ -25233,18 +25233,18 @@ fi
if test "${AST_PRI_FOUND}" = "yes"; then
@@ -25,7 +25,7 @@
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-@@ -24923,8 +24923,8 @@ ac_res=`eval echo '${'$as_ac_Header'}'`
+@@ -25253,8 +25253,8 @@ ac_res=`eval echo '${'$as_ac_Header'}'`
echo "${ECHO_T}$ac_res" >&6; }
else
# Is the header compilable?
@@ -36,7 +36,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24932,7 +24932,7 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -25262,7 +25262,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -45,7 +45,7 @@
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
-@@ -24964,15 +24964,15 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -25294,15 +25294,15 @@ rm -f core conftest.err conftest.$ac_obj
echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
@@ -64,7 +64,7 @@
_ACEOF
if { (ac_try="$ac_cpp conftest.$ac_ext"
case "(($ac_try" in
-@@ -25005,30 +25005,30 @@ echo "${ECHO_T}$ac_header_preproc" >&6;
+@@ -25335,25 +25335,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6;
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
yes:no: )
@@ -103,7 +103,11 @@
+echo "$as_me: WARNING: ${PRI_DIR}/include/bristuffed/libpri.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${PRI_DIR}/include/bristuffed/libpri.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: ${PRI_DIR}/include/bristuffed/libpri.h: in the future, the compiler will take precedence" >&2;}
-
+ ( cat <<\_ASBOX
+ ## ------------------------------- ##
+ ## Report this to www.asterisk.org ##
+@@ -25362,8 +25362,8 @@ _ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
-{ echo "$as_me:$LINENO: checking for ${PRI_DIR}/include/libpri.h" >&5
@@ -115,7 +119,7 @@
else
--- a/configure.ac
+++ b/configure.ac
-@@ -821,7 +821,7 @@ fi
+@@ -819,7 +819,7 @@ fi
AST_EXT_LIB_CHECK([POPT], [popt], [poptStrerror], [popt.h])
@@ -126,7 +130,7 @@
if test -n "${PWLIB_DIR}"; then
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
-@@ -74,7 +74,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
+@@ -75,7 +75,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
#include <zaptel/tonezone.h>
#ifdef HAVE_PRI
More information about the Pkg-voip-commits
mailing list