Commit patch queue (exported by git-debrebase)

[git-debrebase make-patches: export and commit patches]

4 files changed, 70 insertions, 0 deletions

diff --git a/debian/patches/0001-Remember-to-FD_ZERO-a-new-fd_set-thanks-Steve-Langas.patch b/debian/patches/0001-Remember-to-FD_ZERO-a-new-fd_set-thanks-Steve-Langas.patch
new file mode 100644
index 0000000..4ab0204
--- /dev/null
+++ b/debian/patches/0001-Remember-to-FD_ZERO-a-new-fd_set-thanks-Steve-Langas.patch
@@ -0,0 +1,22 @@
+From: Paul LeoNerd Evans <leonerd@leonerd.org.uk>
+Date: Mon, 9 Apr 2018 23:46:32 +0100
+Subject: Remember to FD_ZERO() a new fd_set (thanks Steve Langasek)
+ (LP#1744933)
+
+---
+ src/term.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/term.c b/src/term.c
+index e9278b1..d65fb6d 100644
+--- a/src/term.c
++++ b/src/term.c
+@@ -679,6 +679,8 @@ void tickit_term_input_wait_msec(TickitTerm *tt, long msec)
+   }
+ 
+   fd_set readfds;
++  FD_ZERO(&readfds);
++
+   int fd = termkey_get_fd(tk);
+   FD_SET(fd, &readfds);
+   int ret = select(fd + 1, &readfds, NULL, NULL, msec > -1 ? &timeout : NULL);
diff --git a/debian/patches/0002-Don-t-attempt-to-select-on-invalid-fds-thanks-Steve-.patch b/debian/patches/0002-Don-t-attempt-to-select-on-invalid-fds-thanks-Steve-.patch
new file mode 100644
index 0000000..364b58f
--- /dev/null
+++ b/debian/patches/0002-Don-t-attempt-to-select-on-invalid-fds-thanks-Steve-.patch
@@ -0,0 +1,23 @@
+From: Paul LeoNerd Evans <leonerd@leonerd.org.uk>
+Date: Mon, 9 Apr 2018 23:47:47 +0100
+Subject: Don't attempt to select() on invalid fds (thanks Steve Langasek)
+ (LP#1744933)
+
+---
+ src/term.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/term.c b/src/term.c
+index d65fb6d..6ec3f44 100644
+--- a/src/term.c
++++ b/src/term.c
+@@ -682,6 +682,9 @@ void tickit_term_input_wait_msec(TickitTerm *tt, long msec)
+   FD_ZERO(&readfds);
+ 
+   int fd = termkey_get_fd(tk);
++  if (fd < 0 || fd >= FD_SETSIZE)
++    return;
++
+   FD_SET(fd, &readfds);
+   int ret = select(fd + 1, &readfds, NULL, NULL, msec > -1 ? &timeout : NULL);
+ 
diff --git a/debian/patches/0003-Make-sure-to-pass-CFLAGS-LDFLAGS-to-compiler-for-uni.patch b/debian/patches/0003-Make-sure-to-pass-CFLAGS-LDFLAGS-to-compiler-for-uni.patch
new file mode 100644
index 0000000..dec3126
--- /dev/null
+++ b/debian/patches/0003-Make-sure-to-pass-CFLAGS-LDFLAGS-to-compiler-for-uni.patch
@@ -0,0 +1,22 @@
+From: Paul LeoNerd Evans <leonerd@leonerd.org.uk>
+Date: Mon, 9 Apr 2018 23:49:28 +0100
+Subject: Make sure to pass $(CFLAGS) $(LDFLAGS) to compiler for unit tests
+ (thanks Steve Langasek) (LP#1744933)
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index c762c7e..9ace883 100644
+--- a/Makefile
++++ b/Makefile
+@@ -73,7 +73,7 @@ src/linechars.inc: src/linechars.inc.PL
+ 	perl $^ > $@
+ 
+ t/%.t: t/%.c $(LIBRARY) t/taplib.lo t/mockterm.lo t/taplib-tickit.lo
+-	$(LIBTOOL) --mode=link --tag=CC gcc -o $@ -Iinclude -std=c99 -ggdb $^
++	$(LIBTOOL) --mode=link --tag=CC gcc $(CFLAGS) $(LDFLAGS) -o $@ -Iinclude -std=c99 -ggdb $^
+ 
+ t/%.lo: t/%.c
+ 	$(LIBTOOL) --mode=compile --tag=CC gcc $(CFLAGS) -o $@ -c $^
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..cc4f872
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+0001-Remember-to-FD_ZERO-a-new-fd_set-thanks-Steve-Langas.patch
+0002-Don-t-attempt-to-select-on-invalid-fds-thanks-Steve-.patch
+0003-Make-sure-to-pass-CFLAGS-LDFLAGS-to-compiler-for-uni.patch