[Pkg-privacy-commits] [Git][pkg-privacy-team/pond][master] 2 commits: Fix build on arm64

[Ulrike Uhlig]

Ulrike Uhlig pushed to branch master at Privacy Maintainers / pond


Commits:
8409a22e by Ximin Luo at 2015-11-13T02:59:37+01:00
Fix build on arm64

- - - - -
d6c021a4 by Ximin Luo at 2015-11-13T03:06:47+01:00
Release 0.1.1-4 to Debian experimental.

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/fix-build-on-arm64.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pond (0.1.1-4) experimental; urgency=medium
+
+  * Fix build on arm64.
+
+ -- Ximin Luo <infinity0 at debian.org>  Fri, 13 Nov 2015 03:06:44 +0100
+
 pond (0.1.1-3) experimental; urgency=medium
 
   * Disable buildtime tests that test runtime behaviour.


=====================================
debian/patches/fix-build-on-arm64.patch
=====================================
--- /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)


=====================================
debian/patches/series
=====================================
--- 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



View it on GitLab: https://salsa.debian.org/pkg-privacy-team/pond/compare/3df099b6e81c95c7de86ded18947a8c87680723c...d6c021a4433cb64f638f450bb28007acbf5bf9ff

-- 
View it on GitLab: https://salsa.debian.org/pkg-privacy-team/pond/compare/3df099b6e81c95c7de86ded18947a8c87680723c...d6c021a4433cb64f638f450bb28007acbf5bf9ff
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-privacy-commits/attachments/20180528/93a18f8b/attachment-0001.html>