Control: tags -1 patch
On 2015-06-04 Andreas Metzler <ametz...@debian.org> wrote:
> forwarded 785297 https://github.com/tatsuhiro-t/aria2/issues/346
> #
> https://github.com/tatsuhiro-t/aria2/commit/fd6f5ebc32eb5f74501e11b7e519642ee95d49f0
> - This is also part of 1.19.0
> tags 785297 + fixed-upstream
> thanks
Find attached a minimal patch for the debian package to include the
upstream fix.
cu Andreas
--
`What a good friend you are to him, Dr. Maturin. His other friends are
so grateful to you.'
`I sew his ears on from time to time, sure'
diff -Nru aria2-1.18.10/debian/changelog aria2-1.18.10/debian/changelog
--- aria2-1.18.10/debian/changelog 2015-05-06 07:30:03.000000000 +0200
+++ aria2-1.18.10/debian/changelog 2015-06-04 18:56:38.000000000 +0200
@@ -1,3 +1,12 @@
+aria2 (1.18.10-2.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Pull 20_Fix-getrandom-interface-detection.patch from upstream GIT.
+ Closes: #785297
+ * Use dh_autoreconf, the abovementioned patch changes configure.ac.
+
+ -- Andreas Metzler <ametz...@debian.org> Thu, 04 Jun 2015 18:41:48 +0200
+
aria2 (1.18.10-2) unstable; urgency=low
* Uploaded to unstable.
diff -Nru aria2-1.18.10/debian/control aria2-1.18.10/debian/control
--- aria2-1.18.10/debian/control 2014-10-11 09:39:54.000000000 +0200
+++ aria2-1.18.10/debian/control 2015-06-04 18:55:37.000000000 +0200
@@ -5,6 +5,7 @@
Uploaders: Kartik Mistry <kar...@debian.org>
Build-Depends: autotools-dev,
debhelper (>= 7),
+ dh-autoreconf,
dpkg-dev (>= 1.16.1~),
libc-ares-dev,
libgcrypt11-dev (>= 1.5.0-3) | libgcrypt-dev,
diff -Nru aria2-1.18.10/debian/patches/20_Fix-getrandom-interface-detection.patch aria2-1.18.10/debian/patches/20_Fix-getrandom-interface-detection.patch
--- aria2-1.18.10/debian/patches/20_Fix-getrandom-interface-detection.patch 1970-01-01 01:00:00.000000000 +0100
+++ aria2-1.18.10/debian/patches/20_Fix-getrandom-interface-detection.patch 2015-06-04 18:41:08.000000000 +0200
@@ -0,0 +1,30 @@
+From fd6f5ebc32eb5f74501e11b7e519642ee95d49f0 Mon Sep 17 00:00:00 2001
+From: Nils Maier <maier...@web.de>
+Date: Sun, 1 Mar 2015 09:44:59 +0100
+Subject: [PATCH] Fix getrandom interface detection
+
+Fixes GH-346
+---
+ configure.ac | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 1f935e7..c946866 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -758,10 +758,12 @@ AC_CHECK_FUNCS([__argz_count \
+
+ AC_MSG_CHECKING([for getrandom linux syscall interface])
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
++#include <sys/syscall.h>
+ #include <linux/random.h>
+ ]],
+ [[
+ int x = GRND_NONBLOCK;
++int y = (int)SYS_getrandom;
+ ]])],
+ [have_getrandom_interface=yes
+ AC_DEFINE([HAVE_GETRANDOM_INTERFACE], [1], [Define to 1 if getrandom linux syscall interface is available.])],
+--
+2.1.4
+
diff -Nru aria2-1.18.10/debian/patches/series aria2-1.18.10/debian/patches/series
--- aria2-1.18.10/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ aria2-1.18.10/debian/patches/series 2015-06-04 18:41:35.000000000 +0200
@@ -0,0 +1 @@
+20_Fix-getrandom-interface-detection.patch
diff -Nru aria2-1.18.10/debian/rules aria2-1.18.10/debian/rules
--- aria2-1.18.10/debian/rules 2013-09-22 14:58:28.000000000 +0200
+++ aria2-1.18.10/debian/rules 2015-06-04 18:47:25.000000000 +0200
@@ -26,8 +26,12 @@
dh_testroot
rm -f build-stamp
[ ! -f Makefile ] || $(MAKE) distclean
+ dh_autoreconf_clean
dh_clean
+configure: configure.ac
+ dh_autoreconf
+
config.status: configure
dh_testdir
