[Pkg-privacy-commits] [pond] 01/02: Fix build on arm64

[Ximin Luo]

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

infinity0 pushed a commit to annotated tag debian/0.1.1-4
in repository pond.

commit 8409a22e5cf49bab6e9efce7dd799d17387e5f04
Author: Ximin Luo <infinity0 at debian.org>
Date:   Fri Nov 13 02:59:37 2015 +0100

    Fix build on arm64
---
 debian/changelog                        |  6 ++++++
 debian/patches/fix-build-on-arm64.patch | 18 ++++++++++++++++++
 debian/patches/series                   |  1 +
 3 files changed, 25 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1a45c61..3306ae1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pond (0.1.1-4) UNRELEASED; urgency=medium
+
+  * Fix build on arm64.
+
+ -- Ximin Luo <infinity0 at debian.org>  Fri, 13 Nov 2015 02:59:17 +0100
+
 pond (0.1.1-3) experimental; urgency=medium
 
   * Disable buildtime tests that test runtime behaviour.
diff --git a/debian/patches/fix-build-on-arm64.patch b/debian/patches/fix-build-on-arm64.patch
new file mode 100644
index 0000000..5a29b5f
--- /dev/null
+++ b/debian/patches/fix-build-on-arm64.patch
@@ -0,0 +1,18 @@
+Description: Fix build on arm64
+ As per `man dup3`, this is the same as dup2 with empty flags (last argument)
+ and if the two fd arguments are not equal, as is the case here in the fix.
+Author: Ximin Luo <infinity0 at debian.org>
+Bug: https://github.com/agl/pond/issues/208
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/client/disk/disk.go
++++ b/client/disk/disk.go
+@@ -419,7 +419,7 @@
+ 		if sf.lockFd != nil {
+ 			// Duplicate the new file descriptor over the old one.
+ 			// This will unlock the old inode.
+-			if err := syscall.Dup2(newFd, *sf.lockFd); err != nil {
++			if err := syscall.Dup3(newFd, *sf.lockFd, 0); err != nil {
+ 				panic(err)
+ 			}
+ 			syscall.Close(newFd)
diff --git a/debian/patches/series b/debian/patches/series
index c607557..f82667f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 disable-runtime-test.patch
 fix-nogtk-gui.patch
+fix-build-on-arm64.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/pond.git