[Pkg-voip-commits] r10688 - in /dahdi-tools/trunk/debian: changelog patches/gcc5.patch patches/series

[tzafrir at alioth.debian.org]

Author: tzafrir
Date: Sun Jun 28 20:08:00 2015
New Revision: 10688

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=10688
Log:
gcc5.patch (Closes: #777829).

Added:
    dahdi-tools/trunk/debian/patches/gcc5.patch
Modified:
    dahdi-tools/trunk/debian/changelog
    dahdi-tools/trunk/debian/patches/series

Modified: dahdi-tools/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/changelog?rev=10688&op=diff
==============================================================================
--- dahdi-tools/trunk/debian/changelog	(original)
+++ dahdi-tools/trunk/debian/changelog	Sun Jun 28 20:08:00 2015
@@ -1,3 +1,9 @@
+dahdi-tools (1:2.10.2-2) UNRELEASED; urgency=medium
+
+  * gcc5.patch (Closes: #777829).
+
+ -- Tzafrir Cohen <tzafrir at debian.org>  Sun, 28 Jun 2015 08:15:29 +0300
+
 dahdi-tools (1:2.10.2-1) unstable; urgency=medium
 
   * New upstream release:

Added: dahdi-tools/trunk/debian/patches/gcc5.patch
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/patches/gcc5.patch?rev=10688&op=file
==============================================================================
--- dahdi-tools/trunk/debian/patches/gcc5.patch	(added)
+++ dahdi-tools/trunk/debian/patches/gcc5.patch	Sun Jun 28 20:08:00 2015
@@ -0,0 +1,33 @@
+From 5db44e215090e7d61602e206a09a4af394b022cb Mon Sep 17 00:00:00 2001
+From: Russ Meyerriecks <rmeyerriecks at digium.com>
+Date: Wed, 17 Jun 2015 11:36:16 -0500
+Subject: [PATCH] xpp: Fix a logical not being applied to the wrong operand
+
+gcc 5 found this with the new -Werror=logical-not-parenthesis warning. Since we
+have -Wall by default, it would also fail the compile.
+
+Internal-Issue-ID: DAHLIN-347
+
+Signed-off-by: Russ Meyerriecks <rmeyerriecks at digium.com>
+Acked-by: Shaun Ruffell <sruffell at digium.com>
+(cherry picked from commit 9a181ccfbcfa846aab20bd1dcbea8f83356e2705)
+---
+ xpp/mpptalk.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/xpp/mpptalk.c b/xpp/mpptalk.c
+index e49c3cd..9bab867 100644
+--- a/xpp/mpptalk.c
++++ b/xpp/mpptalk.c
+@@ -512,7 +512,7 @@ int mpp_send_seg(struct astribank_device *astribank, const uint8_t *data, uint16
+ 
+ 	assert(astribank != NULL);
+ 	xtalk_dev = astribank->xtalk_dev;
+-	if(!astribank->burn_state == BURN_STATE_STARTED) {
++	if(astribank->burn_state != BURN_STATE_STARTED) {
+ 		ERR("Tried to send a segment while burn_state=%d\n",
+ 				astribank->burn_state);
+ 		return -EINVAL;
+-- 
+2.1.4
+

Modified: dahdi-tools/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/patches/series?rev=10688&op=diff
==============================================================================
--- dahdi-tools/trunk/debian/patches/series	(original)
+++ dahdi-tools/trunk/debian/patches/series	Sun Jun 28 20:08:00 2015
@@ -3,3 +3,4 @@
 init_unload_oslec
 remove_dahdi_speed
 debian-cflags.patch
+gcc5.patch