[Pkg-voip-commits] r7901 - in /asterisk/trunk/debian: ./ patches/
paravoid at alioth.debian.org
paravoid at alioth.debian.org
Sat Dec 19 00:23:37 UTC 2009
Author: paravoid
Date: Sat Dec 19 00:23:37 2009
New Revision: 7901
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7901
Log:
Use DEP3 to tag all of our patches and their merge status.
Modified:
asterisk/trunk/debian/changelog
asterisk/trunk/debian/patches/allow-tilde-destdir
asterisk/trunk/debian/patches/astgenkey-security
asterisk/trunk/debian/patches/dahdi-fxsks-hookstate
asterisk/trunk/debian/patches/dahdi_pri_debug_spannums
asterisk/trunk/debian/patches/dahdi_ptmp_nt
asterisk/trunk/debian/patches/h323-fix-makefile
asterisk/trunk/debian/patches/h323-no-deps-on-asterisk
asterisk/trunk/debian/patches/h323-workaround-openh323-segfault
asterisk/trunk/debian/patches/hack-multiple-app-voicemail
asterisk/trunk/debian/patches/make-clean-fixes
asterisk/trunk/debian/patches/safe_asterisk-config
asterisk/trunk/debian/patches/safe_asterisk-nobg
Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=7901&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Sat Dec 19 00:23:37 2009
@@ -1,8 +1,9 @@
asterisk (1:1.6.2.0-1) UNRELEASED; urgency=low
* New upstream release.
-
- -- Faidon Liambotis <paravoid at debian.org> Sat, 19 Dec 2009 01:51:41 +0200
+ * Use DEP3 to tag all of our patches and their merge status.
+
+ -- Faidon Liambotis <paravoid at debian.org> Sat, 19 Dec 2009 02:23:30 +0200
asterisk (1:1.6.2.0~rc7-1) unstable; urgency=high
Modified: asterisk/trunk/debian/patches/allow-tilde-destdir
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/allow-tilde-destdir?rev=7901&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/allow-tilde-destdir (original)
+++ asterisk/trunk/debian/patches/allow-tilde-destdir Sat Dec 19 00:23:37 2009
@@ -1,3 +1,8 @@
+Subject: relax badshell tilde test
+Author: Faidon Liambotis <paravoid at debian.org>
+Bug: http://issues.asterisk.org/view.php?id=14718
+Last-Update: 2009-12-19
+
badshell is disallowing tildes (~) in the DESTDIR directory to warn people
who use a shell that doesn't expand it to $HOMEDIR.
@@ -7,7 +12,6 @@
This patch relaxes this test just for cases where the ~ is followed by a '/',
which should catch most cases.
-Upstream issue: http://issues.asterisk.org/view.php?id=14718
--- a/Makefile
+++ b/Makefile
@@ -609,7 +609,7 @@ oldmodcheck:
Modified: asterisk/trunk/debian/patches/astgenkey-security
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/astgenkey-security?rev=7901&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/astgenkey-security (original)
+++ asterisk/trunk/debian/patches/astgenkey-security Sat Dec 19 00:23:37 2009
@@ -1,11 +1,10 @@
-astgenkey should generate a private key that is not world-readable.
-
-Upstream bug: http://issues.asterisk.org/view.php?id=12373
+Subject: astgenkey should generate a private key that is not world-readable
+Author: Lionel Elie Mamane <lionel at mamane.lu>
+Bug: http://issues.asterisk.org/view.php?id=12373
+Last-Update: 2009-12-19
Upstream has not accepted this patch and chose intead to document this
as a known minor issue.
-
- -- Lionel Elie Mamane <lionel at mamane.lu>
--- a/contrib/scripts/astgenkey
+++ b/contrib/scripts/astgenkey
Modified: asterisk/trunk/debian/patches/dahdi-fxsks-hookstate
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/dahdi-fxsks-hookstate?rev=7901&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/dahdi-fxsks-hookstate (original)
+++ asterisk/trunk/debian/patches/dahdi-fxsks-hookstate Sat Dec 19 00:23:37 2009
@@ -1,5 +1,7 @@
-Allow FXO channels to send out calls even before someone calls in through
-them.
+Subject: Allow FXO channels to send out calls even before someone calls in through them
+Author: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+Bug: http://issues.asterisk.org/view.php?id=14577
+Last-Update: 2009-12-19
This rxisoffhook does not work. Before 1.6.0 it was wrapped in a #ifdef
DAHDI_CHECK_HOOKSTATE (or rather: ZAP_CHECK_HOOKSTATE). In 1.6 it is
@@ -7,8 +9,6 @@
On DAHDI (the kernel) this field is not properly initialized at startup.
And thus it will only work after an incoming ring.
-
-Upstream issue: http://issues.asterisk.org/view.php?id=14577
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
Modified: asterisk/trunk/debian/patches/dahdi_pri_debug_spannums
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/dahdi_pri_debug_spannums?rev=7901&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/dahdi_pri_debug_spannums (original)
+++ asterisk/trunk/debian/patches/dahdi_pri_debug_spannums Sat Dec 19 00:23:37 2009
@@ -1,11 +1,11 @@
-Print span number (when available) on PRI trace messages.
+Subject: Print span number (when available) on PRI trace messages
+Author: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+Bug: http://issues.asterisk.org/view.php?id=15054
+Origin: backport, http://svn.digium.com/view/asterisk?view=rev&revision=225836
+Last-Update: 2009-12-19
This allows tracing ("pri debug" / "pri set debug") more than one span at
a time in a sane manner.
-
-Included in upstream version 1.8.
-
-Upstream issue: http://issues.asterisk.org/view.php?id=15054
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
Modified: asterisk/trunk/debian/patches/dahdi_ptmp_nt
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/dahdi_ptmp_nt?rev=7901&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/dahdi_ptmp_nt (original)
+++ asterisk/trunk/debian/patches/dahdi_ptmp_nt Sat Dec 19 00:23:37 2009
@@ -1,4 +1,8 @@
-Give DAHDI PtMP NT mode a shot.
+Subject: Give DAHDI PtMP NT mode a shot
+Author: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+Bug: http://issues.asterisk.org/view.php?id=15048
+Forwarded: not-needed
+Last-Update: 2009-12-19
This basically sort-of works. But then again, implementing the whole mode
in a three-liner patch is quite a feat ;-)
@@ -6,7 +10,6 @@
Proper PtMP NT support is included in version 1.8. Backporting it may not
be that simple.
-http://issues.asterisk.org/view.php?id=15048
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -16510,7 +16510,8 @@ static int process_dahdi(struct dahdi_ch
Modified: asterisk/trunk/debian/patches/h323-fix-makefile
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/h323-fix-makefile?rev=7901&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/h323-fix-makefile (original)
+++ asterisk/trunk/debian/patches/h323-fix-makefile Sat Dec 19 00:23:37 2009
@@ -1,4 +1,7 @@
-Fix LD flags on chan_h323.so
+Subject: Fix LD flags on chan_h323.so
+Author: Faidon Liambotis <paravoid at debian.org>
+Forwarded: no
+Last-Update: 2009-12-19
chan_h323.so's LD flags are wrong in the first invocation of make: openh323 and
pt are not included.
@@ -7,8 +10,6 @@
chan_h323 was enabled.
Fix this properly by fixing channels/Makefile
-
- -- Faidon Liambotis <paravoid at debian.org>
--- a/channels/Makefile
+++ b/channels/Makefile
Modified: asterisk/trunk/debian/patches/h323-no-deps-on-asterisk
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/h323-no-deps-on-asterisk?rev=7901&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/h323-no-deps-on-asterisk (original)
+++ asterisk/trunk/debian/patches/h323-no-deps-on-asterisk Sat Dec 19 00:23:37 2009
@@ -1,11 +1,15 @@
+Subject: Avoid linking the asterisk binary with the H.323 libraries
+Author: Faidon Liambotis <paravoid at debian.org>
+Forwarded: no
+Last-Update: 2009-12-19
+
Don't link the Asterisk binary with the H.323 libraries since they are only
used by separate shared object, chan_h323.so. (Closes: #433884)
WARNING: this will make Asterisk segfault (see #435146) when loading
chan_h323.so because libopenh323 is buggy (#438815).
+
We are working around this, see patch h323-workaround-openh323-segfault.
-
- -- Faidon Liambotis <paravoid at debian.org>
--- a/main/Makefile
+++ b/main/Makefile
Modified: asterisk/trunk/debian/patches/h323-workaround-openh323-segfault
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/h323-workaround-openh323-segfault?rev=7901&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/h323-workaround-openh323-segfault (original)
+++ asterisk/trunk/debian/patches/h323-workaround-openh323-segfault Sat Dec 19 00:23:37 2009
@@ -1,4 +1,7 @@
-Hack dynamic loader to workaround libopenh323 bug
+Subject: Hack dynamic loader to workaround libopenh323 bug
+Author: Faidon Liambotis <paravoid at debian.org>
+Forwarded: no
+Last-Update: 2009-12-19
libopenh323 is buggy and crashes on dlclose() when the library was opened with
RTLD_LAZY (#438815). Hack around this by opening it with RTLD_NOW by matching
@@ -10,8 +13,6 @@
for any reason.
Should be removed when #438815 closes.
-
- -- Faidon Liambotis <paravoid at debian.org>
--- a/main/loader.c
+++ b/main/loader.c
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=7901&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/hack-multiple-app-voicemail (original)
+++ asterisk/trunk/debian/patches/hack-multiple-app-voicemail Sat Dec 19 00:23:37 2009
@@ -1,3 +1,8 @@
+Subject: build multiple versions of app_voicemail.so
+Author: Faidon Liambotis <paravoid at debian.org>
+Bug: http://issues.asterisk.org/view.php?id=13822
+Last-Update: 2009-12-19
+
This is a very ugly hack on upstream's Makefiles to allow building multiple
variants of app_voicemail. Three variants are created:
* app_voicemail.so: plain old filesystem storage that doesn't break existing
@@ -9,10 +14,6 @@
They are marked noload on our default autoload configuration.
Patch suggested to upstream but rejected for being "hackish":
-
- http://issues.asterisk.org/view.php?id=13822
-
- -- Faidon Liambotis <paravoid at debian.org>
--- a/apps/Makefile
+++ b/apps/Makefile
Modified: asterisk/trunk/debian/patches/make-clean-fixes
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/make-clean-fixes?rev=7901&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/make-clean-fixes (original)
+++ asterisk/trunk/debian/patches/make-clean-fixes Sat Dec 19 00:23:37 2009
@@ -1,10 +1,7 @@
-Don't remove sounds on dist-clean, upstream tarballs come with
-one of them.
-
- -- Faidon Liambotis <paravoid at debian.org>
-
-Currently no upstream issue. But anyway, we should revisit it when we decide
-on packaging of sound files.
+Subject: Don't remove sounds on dist-clean
+Author: Faidon Liambotis <paravoid at debian.org>
+Forwarded: not-needed
+Last-Update: 2009-12-19
--- a/Makefile
+++ b/Makefile
Modified: asterisk/trunk/debian/patches/safe_asterisk-config
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/safe_asterisk-config?rev=7901&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/safe_asterisk-config (original)
+++ asterisk/trunk/debian/patches/safe_asterisk-config Sat Dec 19 00:23:37 2009
@@ -1,9 +1,10 @@
+Subject: use /etc/default/settings for configuring safe_asterisk (vendor specific)
+Author: Faidon Liambotis <paravoid at debian.org>
+Bug-Debian: http://bugs.debian.org/381786
+Last-Update: 2009-12-19
+
Use ASTSAFE_TTY and ASTSAFE_CONSOLE from /etc/default/asterisk to configure
safe_asterisk.
-
-Closes: #381786
-
- -- Faidon Liambotis <paravoid at debian.org>
--- a/contrib/scripts/safe_asterisk
+++ b/contrib/scripts/safe_asterisk
Modified: asterisk/trunk/debian/patches/safe_asterisk-nobg
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/safe_asterisk-nobg?rev=7901&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/safe_asterisk-nobg (original)
+++ asterisk/trunk/debian/patches/safe_asterisk-nobg Sat Dec 19 00:23:37 2009
@@ -1,14 +1,14 @@
-Add an option to safe_asterisk so that it won't background.
+Subject: Add an option to safe_asterisk so that it won't background.
+Author: Faidon Liambotis <paravoid at debian.org>
+Bug-Debian: http://bugs.debian.org/376514
+Forwarded: not-needed
+Last-Update: 2009-12-19
This is intended to work with start-stop-daemon's --background option which
results in a correct pidfile since the process doesn't fork.
-#376514, #362281
-
Needs more work from me to not change behavior for users but only for the
init script. After that, it can safely go upstream.
-
- -- Faidon Liambotis <paravoid at debian.org>
--- a/contrib/scripts/safe_asterisk
+++ b/contrib/scripts/safe_asterisk
More information about the Pkg-voip-commits
mailing list