[med-svn] [Git][med-team/libtecla][master] 3 commits: Enable gl_get_line() to detect EOF

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / libtecla


Commits:
0afdb49f by Andreas Tille at 2017-08-22T21:38:19+02:00
Enable gl_get_line() to detect EOF

- - - - -
72ddc236 by Andreas Tille at 2017-08-22T21:40:15+02:00
Drop Build-Depends that are not needed for debhelper 10

- - - - -
ec1d4bbf by Andreas Tille at 2017-08-22T21:59:00+02:00
hardening; no parallel build (otherwise build fails)

- - - - -


5 changed files:

- debian/changelog
- debian/control
- + debian/patches/libtecla-fix-eof-handling.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
-libtecla (1.6.3-2) UNRELEASED; urgency=medium
+libtecla (1.6.3-2) unstable; urgency=medium
 
   * Moved packaging from SVN to Git
   * Standards-Version: 4.0.1 (no changes needed)
   * debhelper 10
+  * Enable gl_get_line() to detect EOF (Thanks for the patch to Guido
+    Berhoerster <guido+debian.org at berhoerster.name>)
+    Closes: #872865
+  * hardening
 
- -- Andreas Tille <tille at debian.org>  Tue, 22 Aug 2017 21:17:45 +0200
+ -- Andreas Tille <tille at debian.org>  Tue, 22 Aug 2017 21:42:28 +0200
 
 libtecla (1.6.3-1) unstable; urgency=medium
 


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,6 @@ Uploaders: Scott Christley <schristley at mac.com>,
 Section: science
 Priority: optional
 Build-Depends: debhelper (>= 10),
-               dh-autoreconf,
-               autotools-dev,
                d-shlibs
 Standards-Version: 4.0.1
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/libtecla.git


=====================================
debian/patches/libtecla-fix-eof-handling.patch
=====================================
--- /dev/null
+++ b/debian/patches/libtecla-fix-eof-handling.patch
@@ -0,0 +1,32 @@
+Author: Guido Berhoerster <guido+debian.org at berhoerster.name>
+Last-Update: Mon, 21 Aug 2017 21:43:09 +0000
+Bug-Debian: https://bugs.debian.org/872865
+Description: Enable gl_get_line() to detect EOF
+
+--- a/getline.c
++++ b/getline.c
+@@ -3296,6 +3296,7 @@ static GlReadStatus gl_read_input(GetLin
+ static GlReadStatus gl_read_unmasked(GetLine *gl, int fd, char *c)
+ {
+   int nread;  /* The return value of read() */
++  int saved_errno;
+ /*
+  * Unblock the signals that we are trapping, while waiting for I/O.
+  */
+@@ -3307,6 +3308,7 @@ static GlReadStatus gl_read_unmasked(Get
+   do {
+     errno = 0;
+     nread = read(fd, c, 1);
++    saved_errno = errno;
+   } while(nread < 0 && errno==EINTR);
+ /*
+  * Block all of the signals that we are trapping.
+@@ -3319,7 +3321,7 @@ static GlReadStatus gl_read_unmasked(Get
+   case 1:
+     return GL_READ_OK;
+   case 0:
+-    return (isatty(fd) || errno != 0) ? GL_READ_BLOCKED : GL_READ_EOF;
++    return (isatty(fd) || saved_errno != 0) ? GL_READ_BLOCKED : GL_READ_EOF;
+   default:
+     return GL_READ_ERROR;
+   };


=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ manpage-fix.patch
 kfreebsd+hurd.patch
 remove_makefile_to_enable_smooth_regeneration.patch
 spelling.patch
+libtecla-fix-eof-handling.patch


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -2,8 +2,10 @@
 # debian/rules file for tecla
 export DH_VERBOSE=1
 
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+
 %:
-	dh $@ --with autotools_dev,autoreconf
+	dh $@ --no-parallel
 
 override_dh_install:
 	dh_install



View it on GitLab: https://salsa.debian.org/med-team/libtecla/compare/7228af9c90ebe2c4ebc600c895659cfb436a6c5f...ec1d4bbf5e9125bd88e92d62de45b8d325c3a65e

---
View it on GitLab: https://salsa.debian.org/med-team/libtecla/compare/7228af9c90ebe2c4ebc600c895659cfb436a6c5f...ec1d4bbf5e9125bd88e92d62de45b8d325c3a65e
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/debian-med-commit/attachments/20180502/dffb17e0/attachment-0001.html>