[DHG_packages] 01/01: posix-pty: add avoid-libutil.patch

Sean Whitton spwhitton at spwhitton.name
Sun May 14 23:57:04 UTC 2017


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

spwhitton pushed a commit to annotated tag haskell-posix-pty_v0.2.1.1-2
in repository DHG_packages.

commit 9bc740d596d5b1b72aa29c438b9fc5e2ffd099ee
Author: Sean Whitton <spwhitton at spwhitton.name>
Date:   Sun May 14 16:53:54 2017 -0700

    posix-pty: add avoid-libutil.patch
---
 p/haskell-posix-pty/debian/changelog               |  7 +++++++
 .../debian/patches/avoid-libutil.patch             | 23 ++++++++++++++++++++++
 p/haskell-posix-pty/debian/patches/series          |  1 +
 3 files changed, 31 insertions(+)

diff --git a/p/haskell-posix-pty/debian/changelog b/p/haskell-posix-pty/debian/changelog
index e23a983..3d9c23c 100644
--- a/p/haskell-posix-pty/debian/changelog
+++ b/p/haskell-posix-pty/debian/changelog
@@ -1,3 +1,10 @@
+haskell-posix-pty (0.2.1.1-2) unstable; urgency=medium
+
+  * Add patch to use pty.h, not libutil.h, on non-Linux (Closes: #862227).
+    Thanks Aaron M. Ucko for the report and fix.
+
+ -- Sean Whitton <spwhitton at spwhitton.name>  Sun, 14 May 2017 16:53:25 -0700
+
 haskell-posix-pty (0.2.1.1-1) unstable; urgency=medium
 
   * Initial release (Closes: #861922).
diff --git a/p/haskell-posix-pty/debian/patches/avoid-libutil.patch b/p/haskell-posix-pty/debian/patches/avoid-libutil.patch
new file mode 100644
index 0000000..51942d1
--- /dev/null
+++ b/p/haskell-posix-pty/debian/patches/avoid-libutil.patch
@@ -0,0 +1,23 @@
+Description: Avoid libutil.h on non-Linux
+ Upstream assumes that non-Linux lacks pty.h, but in fact it is
+ non-glibc systems that lack pty.h.
+Author: "Aaron M. Ucko" <ucko at debian.org>
+Reviewed-by: Sean Whitton <spwhitton at spwhitton.name>
+Bug-Debian: https://bugs.debian.org/862227
+Forwarded: https://github.com/merijn/posix-pty/pull/13
+---
+
+--- haskell-posix-pty-0.2.1.1.orig/cbits/fork_exec_with_pty.c
++++ haskell-posix-pty-0.2.1.1/cbits/fork_exec_with_pty.c
+@@ -13,9 +13,9 @@
+ 
+ #if defined(__APPLE__)
+ #include <util.h>
+-#elif defined(__linux__)
++#elif defined(__GLIBC__)
+ #include <pty.h>
+-#else /* bsd */
++#else /* bsd without glibc */
+ #include <libutil.h>
+ #endif
+ 
diff --git a/p/haskell-posix-pty/debian/patches/series b/p/haskell-posix-pty/debian/patches/series
new file mode 100644
index 0000000..443f885
--- /dev/null
+++ b/p/haskell-posix-pty/debian/patches/series
@@ -0,0 +1 @@
+avoid-libutil.patch

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



More information about the Pkg-haskell-commits mailing list