[Pkg-voip-commits] r6985 - in /asterisk/trunk/debian: asterisk.install changelog patches/apptest_sleep patches/astgenkey-security patches/h323-make-fix patches/hack-multiple-app-voicemail patches/libtonezone_libm patches/series rules

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Fri Apr 10 20:16:32 2009
New Revision: 6985

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6985
Log:
* New upstream release (Closes: #522528).
* Patch apptest_sleep dropped: merged upstream.
* Patch libtonezone_libm dropped: merged upstream.
* Patch h323-make-fix dropped: merged upstream.

Removed:
    asterisk/trunk/debian/patches/apptest_sleep
    asterisk/trunk/debian/patches/h323-make-fix
    asterisk/trunk/debian/patches/libtonezone_libm
Modified:
    asterisk/trunk/debian/asterisk.install
    asterisk/trunk/debian/changelog
    asterisk/trunk/debian/patches/astgenkey-security
    asterisk/trunk/debian/patches/hack-multiple-app-voicemail
    asterisk/trunk/debian/patches/series
    asterisk/trunk/debian/rules

Modified: asterisk/trunk/debian/asterisk.install
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/asterisk.install?rev=6985&op=diff
==============================================================================
--- asterisk/trunk/debian/asterisk.install (original)
+++ asterisk/trunk/debian/asterisk.install Fri Apr 10 20:16:32 2009
@@ -2,3 +2,4 @@
 usr/sbin
 usr/share/asterisk/firmware
 usr/share/asterisk/keys
+usr/share/asterisk/conf

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=6985&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Fri Apr 10 20:16:32 2009
@@ -1,12 +1,16 @@
-asterisk (1:1.6.1.0~dfsg~rc3-2) UNRELEASED; urgency=low
+asterisk (1:1.6.1.0~dfsg~rc4-1) UNRELEASED; urgency=low
 
   [ Mark Purcell ]
   * NOT RELEASED YET
 
   [ Tzafrir Cohen ]
+  * New upstream release (Closes: #522528).
   * Depend explicitly on dahdi.
-
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Thu, 02 Apr 2009 01:19:31 +0300
+  * Patch apptest_sleep dropped: merged upstream.
+  * Patch libtonezone_libm dropped: merged upstream.
+  * Patch h323-make-fix dropped: merged upstream.
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Fri, 10 Apr 2009 23:10:46 +0300
 
 asterisk (1:1.6.1.0~dfsg~rc3-1) experimental; urgency=low
 

Modified: asterisk/trunk/debian/patches/astgenkey-security
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/astgenkey-security?rev=6985&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/astgenkey-security (original)
+++ asterisk/trunk/debian/patches/astgenkey-security Fri Apr 10 20:16:32 2009
@@ -1,6 +1,9 @@
 astgenkey should generate a private key that is not world-readable.
 
 Upstream bug: http://bugs.digium.com/view.php?id=12373
+
+Upstream has not accepted this patch and chose intead to document this 
+as a known minor issue.
 
  -- Lionel Elie Mamane <lionel at mamane.lu>
 
@@ -12,7 +15,7 @@
  echo "Generating SSL key '$KEY': "
 +umask 0077
  openssl genrsa -out ${KEY}.key ${DES3} 1024
-+[ "$(id -u)" = 0 ] && chown asterisk:asterisk ${KEY}.key
++[ "$(id -u)" = 0 ] && chown asterisk: ${KEY}.key
 +umask 0022
  openssl rsa -in ${KEY}.key -pubout -out ${KEY}.pub
  

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=6985&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/hack-multiple-app-voicemail (original)
+++ asterisk/trunk/debian/patches/hack-multiple-app-voicemail Fri Apr 10 20:16:32 2009
@@ -8,7 +8,9 @@
 concurrently.
 They are marked noload on our default autoload configuration.
 
-Upstream bug: http://bugs.digium.com/13822
+Patch suggested to upstream but rejected for being "hackish":
+
+  http://bugs.digium.com/view.php?id=13822
 
  -- Faidon Liambotis <paravoid at debian.org>
 

Modified: asterisk/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/series?rev=6985&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/series (original)
+++ asterisk/trunk/debian/patches/series Fri Apr 10 20:16:32 2009
@@ -12,13 +12,10 @@
 #h323-workaround-openh323-segfault
 
 astgenkey-security
-apptest_sleep
 
 ### new features
 pubkey_jnctn
 
 # bugfixes on top of everything
 disable_moh
-libtonezone_libm
 dahdi-fxsks-hookstate
-h323-make-fix

Modified: asterisk/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/rules?rev=6985&op=diff
==============================================================================
--- asterisk/trunk/debian/rules (original)
+++ asterisk/trunk/debian/rules Fri Apr 10 20:16:32 2009
@@ -137,6 +137,7 @@
 	dh_installdirs -s
 	
 	$(FETCH_ENV) $(MAKE) $(BUILDFLAGS) DESTDIR=$(CURDIR)/debian/tmp install
+	cp -a configs $(CURDIR)/debian/tmp/usr/share/asterisk/conf
 
 	dh_install -s --sourcedir=debian/tmp
 	dh_lintian -s