[Pkg-voip-commits] [asterisk] 01/34: Merge NMU 1:13.1.0~dfsg-1.1.

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository asterisk.

commit 791988b8f233c89b600234d335b022512d8f0b60
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Mar 19 17:53:30 2016 +0100

    Merge NMU 1:13.1.0~dfsg-1.1.
---
 debian/changelog                | 14 ++++++++++++++
 debian/patches/configure-osarch | 11 +++++++++++
 debian/patches/series           |  2 ++
 debian/rules                    |  2 +-
 4 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 7924676..a37bd49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,20 @@ asterisk (1:13.1.1~dfsg-1) UNRELEASED; urgency=medium
 
  -- Tzafrir Cohen <tzafrir at debian.org>  Thu, 29 Jan 2015 21:47:34 +0200
 
+asterisk (1:13.1.0~dfsg-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Matthias Klose ]
+  * Build with -fgnu89-inline. Closes: #777782.
+  * CVE-2015-1558: File descriptor leak when incompatible codecs are offered.
+    Closes: #780601.
+
+  [ James Cowgill ]
+  * Fix OSARCH detection on all linux architectures. Closes: #780287.
+
+ -- Matthias Klose <doko at debian.org>  Fri, 10 Jul 2015 12:56:51 +0200
+
 asterisk (1:13.1.0~dfsg-1) unstable; urgency=high
 
   [ Tzafrir Cohen ]
diff --git a/debian/patches/configure-osarch b/debian/patches/configure-osarch
new file mode 100644
index 0000000..b985c3c
--- /dev/null
+++ b/debian/patches/configure-osarch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -178,7 +178,7 @@ case "${host_os}" in
+      OSARCH=cygwin
+      PBX_WINARCH=1
+      ;;
+-     linux-gnueabi* |  linux-gnuspe)
++     linux-gnu*)
+      OSARCH=linux-gnu
+      ;;
+      kfreebsd*-gnu)
diff --git a/debian/patches/series b/debian/patches/series
index 115607b..3f65de7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -23,3 +23,5 @@ smsq_enable.patch
 aelparse_enable.patch
 systemd.patch
 #test_framework.patch
+
+configure-osarch
diff --git a/debian/rules b/debian/rules
index c338853..1fd00b4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -78,7 +78,7 @@ override_dh_autoreconf:
 override_dh_auto_configure:
 	chmod 755 $(CURDIR)/debian/dummyprogs/fetch
 	$(FETCH_ENV) ./configure			\
-		CFLAGS="$(CFLAGS) $(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \
+		CFLAGS="-fgnu89-inline $(CFLAGS) $(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \
 		--host=$(DEB_HOST_GNU_TYPE)		\
 		--build=$(DEB_BUILD_GNU_TYPE)		\
 		--prefix=/usr				\

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/asterisk.git