[Pkg-voip-commits] r10045 - in /asterisk/branches/experimental/debian: ./ patches/

tzafrir at alioth.debian.org tzafrir at alioth.debian.org
Sun Dec 23 19:51:52 UTC 2012 

Author: tzafrir
Date: Sun Dec 23 19:51:51 2012
New Revision: 10045

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=10045
Log:
Initial version with asterisk 11

* asterisk 11.1.0
* It builds. Sort of.
* Patch menuselect_cflags dropped: merged upstream.
* libasteriskssl - in its own package for now.
* pjproject: the beast is disabled for now.
* Patch undeprecate: undeprecate meetme.

Added:
    asterisk/branches/experimental/debian/libasteriskssl1.install
    asterisk/branches/experimental/debian/libasteriskssl1.symbols
    asterisk/branches/experimental/debian/patches/pjproject_disable
    asterisk/branches/experimental/debian/patches/undeprecate
Modified:
    asterisk/branches/experimental/debian/README.Debian
    asterisk/branches/experimental/debian/changelog
    asterisk/branches/experimental/debian/control
    asterisk/branches/experimental/debian/patches/ilbc_disable
    asterisk/branches/experimental/debian/patches/safe_asterisk-config
    asterisk/branches/experimental/debian/patches/safe_asterisk-nobg
    asterisk/branches/experimental/debian/patches/series
    asterisk/branches/experimental/debian/patches/sound_files
    asterisk/branches/experimental/debian/rules

Modified: asterisk/branches/experimental/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/README.Debian?rev=10045&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/README.Debian (original)
+++ asterisk/branches/experimental/debian/README.Debian Sun Dec 23 19:51:51 2012
@@ -1,3 +1,9 @@
+FIXME: list of things that don't yet work. This should be removed:
+* pjproject is currently brutally disabled.
+* libasteriskssl does not live well with dpkg-shlibdeps.
+* Probably others. Didn't have time to run linbtian yet.
+
+
 Welcome to the world of telephone switch owners. Asterisk is a quite powerful
 and probably one of the feature-richest open-source PBXes out there. To get you
 a brief impression where to start tweaking, we've included this doc. (Thanks to

Modified: asterisk/branches/experimental/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/changelog?rev=10045&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/changelog (original)
+++ asterisk/branches/experimental/debian/changelog Sun Dec 23 19:51:51 2012
@@ -1,5 +1,6 @@
-asterisk (1:10.10.0~dfsg-1) UNRELEASED; urgency=low
-
+asterisk (1:11.1.0~dfsg-1) UNRELEASED; urgency=low
+
+  [ Faidon Liambotis ]
   * New major upstream release.
     - Drop patch kfreebsd, fixed upstream.
     - Drop patch httpd_port, never affected 10.x.
@@ -9,6 +10,12 @@
   * Ship UPGRADE-1.8.txt, UPGRADE-1.4.txt, UPGRADE-1.2.txt in asterisk-doc.
   * Do not ship app_meetme.so and app_dahdibarge.so, deprecated by upstream.
     - Also remove them from asterisk-dahdi's full description.
+
+  [ Tzafrir Cohen ]
+  * Patch menuselect_cflags dropped: merged upstream.
+  * libasteriskssl - in its own package for now.
+  * pjproject: the beast is disabled for now.
+  * Patch undeprecate: undeprecate meetme.
 
  -- Faidon Liambotis <paravoid at debian.org>  Thu, 22 Nov 2012 01:45:18 +0200
 

Modified: asterisk/branches/experimental/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/control?rev=10045&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/control (original)
+++ asterisk/branches/experimental/debian/control Sun Dec 23 19:51:51 2012
@@ -258,3 +258,13 @@
  Asterisk is an Open Source PBX and telephony toolkit.
  .
  This package contains the default configuration files of Asterisk.
+
+Package: libasteriskssl1
+Architecture: any
+Section: libs
+Depends: ${misc:Depends}
+Description: asterisk OpenSSL wrapper library
+ Asterisk is an Open Source PBX and telephony toolkit.
+ .
+ This package contains a library Asterisk uses as a thread-safe-initialization
+ wrapper around the OpenSSL libraries.

Added: asterisk/branches/experimental/debian/libasteriskssl1.install
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/libasteriskssl1.install?rev=10045&op=file
==============================================================================
--- asterisk/branches/experimental/debian/libasteriskssl1.install (added)
+++ asterisk/branches/experimental/debian/libasteriskssl1.install Sun Dec 23 19:51:51 2012
@@ -1,0 +1,1 @@
+usr/lib/libasteriskssl.so.*

Added: asterisk/branches/experimental/debian/libasteriskssl1.symbols
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/libasteriskssl1.symbols?rev=10045&op=file
==============================================================================
--- asterisk/branches/experimental/debian/libasteriskssl1.symbols (added)
+++ asterisk/branches/experimental/debian/libasteriskssl1.symbols Sun Dec 23 19:51:51 2012
@@ -1,0 +1,10 @@
+libasteriskssl.so.1 libasteriskssl1 #MINVER#
+ CRYPTO_set_id_callback at Base 1:11.1.0
+ CRYPTO_set_locking_callback at Base 1:11.1.0
+ ERR_free_strings at Base 1:11.1.0
+ ERR_load_BIO_strings at Base 1:11.1.0
+ ERR_load_SSL_strings at Base 1:11.1.0
+ ERR_load_crypto_strings at Base 1:11.1.0
+ SSL_library_init at Base 1:11.1.0
+ SSL_load_error_strings at Base 1:11.1.0
+ ast_ssl_init at Base 1:11.1.0

Modified: asterisk/branches/experimental/debian/patches/ilbc_disable
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/patches/ilbc_disable?rev=10045&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/patches/ilbc_disable (original)
+++ asterisk/branches/experimental/debian/patches/ilbc_disable Sun Dec 23 19:51:51 2012
@@ -8,12 +8,15 @@
 
 Patch needs to be cleaned-up to be uploaded upstream.
 
+FIXME: module now seems to potentially use libilbc. If it can be
+packaged into Debian, no reason to remove it.
+
 --- a/codecs/codec_ilbc.c
 +++ b/codecs/codec_ilbc.c
 @@ -26,6 +26,7 @@
-  */
  
  /*** MODULEINFO
+	<use>ilbc</use>
 +	<defaultenabled>no</defaultenabled>
  	<support_level>core</support_level>
   ***/

Added: asterisk/branches/experimental/debian/patches/pjproject_disable
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/patches/pjproject_disable?rev=10045&op=file
==============================================================================
--- asterisk/branches/experimental/debian/patches/pjproject_disable (added)
+++ asterisk/branches/experimental/debian/patches/pjproject_disable Sun Dec 23 19:51:51 2012
@@ -1,0 +1,36 @@
+Description: disable pjproject for now
+Author: Tzafrir Cohen <tzafrir at debian.org>
+Forwarded: no
+
+--- a/res/Makefile
++++ b/res/Makefile
+@@ -67,7 +67,7 @@ endif
+ ael/pval.o: ael/pval.c
+ 
+ clean::
+-	$(MAKE) -C pjproject realclean
++	#$(MAKE) -C pjproject realclean
+ 	rm -f snmp/*.o snmp/*.i ael/*.o ael/*.i ais/*.o ais/*.i
+ 
+ pjproject/build.mak:
+@@ -79,10 +79,3 @@ pjproject: pjproject/build.mak
+ 	$(MAKE) -j1 -C pjproject dep
+ 	$(MAKE) -j1 -C pjproject
+ 
+-include pjproject/build.mak
+-
+-$(PJ_LIB_FILES): pjproject
+-res_rtp_asterisk.o: $(PJ_LIB_FILES)
+-res_rtp_asterisk.o: _ASTCFLAGS+=$(PJ_CFLAGS)
+-res_rtp_asterisk.so: _ASTLDFLAGS+=$(PJ_LDFLAGS)
+-res_rtp_asterisk.so: LIBS+=$(PJ_LDLIBS)
+--- a/res/res_rtp_asterisk.c
++++ b/res/res_rtp_asterisk.c
+@@ -30,6 +30,7 @@
+ 
+ /*** MODULEINFO
+ 	<support_level>core</support_level>
++	<defaultenabled>no</defaultenabled>
+  ***/
+ 
+ #include "asterisk.h"

Modified: asterisk/branches/experimental/debian/patches/safe_asterisk-config
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/patches/safe_asterisk-config?rev=10045&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/patches/safe_asterisk-config (original)
+++ asterisk/branches/experimental/debian/patches/safe_asterisk-config Sun Dec 23 19:51:51 2012
@@ -1,10 +1,8 @@
-Subject: use /etc/default/settings for configuring safe_asterisk (vendor specific)
+Subject: Don't use TTY9 by default
+
 Author: Faidon Liambotis <paravoid at debian.org>
 Bug-Debian: http://bugs.debian.org/381786
 Last-Update: 2010-02-14
-
-Use ASTSAFE_TTY and ASTSAFE_CONSOLE from /etc/default/asterisk to configure
-safe_asterisk.
 
 --- a/contrib/scripts/safe_asterisk
 +++ b/contrib/scripts/safe_asterisk
@@ -23,6 +21,6 @@
  
 -		if test "x$TTY" != "x" ; then
 +		if test "x$TTY" != "xno" ; then
- 			cd /tmp
+ 			cd "${RUNDIR}"
  			stty sane < /dev/${TTY}
  			nice -n $PRIORITY ${ASTSBINDIR}/asterisk -f ${CLIARGS} ${ASTARGS} > /dev/${TTY} 2>&1 < /dev/${TTY}

Modified: asterisk/branches/experimental/debian/patches/safe_asterisk-nobg
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/patches/safe_asterisk-nobg?rev=10045&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/patches/safe_asterisk-nobg (original)
+++ asterisk/branches/experimental/debian/patches/safe_asterisk-nobg Sun Dec 23 19:51:51 2012
@@ -13,7 +13,7 @@
 --- a/contrib/scripts/safe_asterisk
 +++ b/contrib/scripts/safe_asterisk
 @@ -16,6 +16,7 @@ MACHINE=`hostname`				# To specify which
- DUMPDROP=/tmp
+ RUNDIR=${RUNDIR:-/tmp}
  SLEEPSECS=4
  ASTPIDFILE=${ASTVARRUNDIR}/asterisk.pid
 +SAFE_AST_BACKGROUND=0

Modified: asterisk/branches/experimental/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/patches/series?rev=10045&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/patches/series (original)
+++ asterisk/branches/experimental/debian/patches/series Sun Dec 23 19:51:51 2012
@@ -19,5 +19,5 @@
 enable_addons
 no_uname
 
-menuselect_cflags
 ilbc_disable
+pjproject_disable

Modified: asterisk/branches/experimental/debian/patches/sound_files
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/patches/sound_files?rev=10045&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/patches/sound_files (original)
+++ asterisk/branches/experimental/debian/patches/sound_files Sun Dec 23 19:51:51 2012
@@ -15,18 +15,18 @@
 --- a/sounds/sounds.xml
 +++ b/sounds/sounds.xml
 @@ -6,7 +6,6 @@
- 		<member name="CORE-SOUNDS-EN-ALAW" displayname="English, a-Law format">
  		</member>
  		<member name="CORE-SOUNDS-EN-GSM" displayname="English, GSM format" >
+ 			<support_level>core</support_level>
 -			<defaultenabled>yes</defaultenabled>
  		</member>
  		<member name="CORE-SOUNDS-EN-G729" displayname="English, G.729 format">
- 		</member>
+ 			<support_level>core</support_level>
 @@ -93,7 +92,6 @@
  	</category>
  	<category name="MENUSELECT_MOH" displayname="Music On Hold File Packages" positive_output="yes">
  		<member name="MOH-OPSOUND-WAV" displayname="opsound.org Music On Hold Files, WAV format" >
 -			<defaultenabled>yes</defaultenabled>
+ 			<support_level>core</support_level>
  		</member>
  		<member name="MOH-OPSOUND-ULAW" displayname="opsound.org Music On Hold Files, mu-Law format" >
- 		</member>

Added: asterisk/branches/experimental/debian/patches/undeprecate
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/patches/undeprecate?rev=10045&op=file
==============================================================================
--- asterisk/branches/experimental/debian/patches/undeprecate (added)
+++ asterisk/branches/experimental/debian/patches/undeprecate Sun Dec 23 19:51:51 2012
@@ -1,0 +1,10 @@
+--- a/apps/app_meetme.c
++++ b/apps/app_meetme.c
+@@ -31,7 +31,6 @@
+ 
+ /*** MODULEINFO
+ 	<depend>dahdi</depend>
+-	<defaultenabled>no</defaultenabled>
+ 	<support_level>deprecated</support_level>
+ 	<replacement>app_confbridge</replacement>
+  ***/

Modified: asterisk/branches/experimental/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/rules?rev=10045&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/rules (original)
+++ asterisk/branches/experimental/debian/rules Sun Dec 23 19:51:51 2012
@@ -229,7 +229,9 @@
 	dh_compress -a
 	dh_fixperms -a
 	dh_installdeb -a
-	dh_shlibdeps -a
+	# FIXME: this is broken:
+	LD_LIBRARY_PATH=$(CURDIR)/debian/libasteriskssl1/usr/lib \
+	dh_shlibdeps -a -- --ignore-missing-info
 	dh_gencontrol -a
 	dh_md5sums -a
 	dh_builddeb -a

More information about the Pkg-voip-commits mailing list