On Tue, Apr 07, 2020 at 10:56:38AM +0900, NIIBE Yutaka wrote:
> Sudip Mukherjee <sudipm.mukher...@gmail.com> wrote:
> > I've prepared an NMU for ttyrec (versioned as 1.0.8-5.1) and
> > uploaded it to mentors for sponsoring. Please feel free to tell me if I
> > should remove it.
>
> Thank you for your work.
>
> It is OK for Debian.
>
> Ideally, it should not be Debian-only patch, so that upstream will
> eventually be able to merge the fix.
It seemed to me that the upstream is dead and so I made a Debian only
change. But, in anycase, if you want something which can be done upstream
then you can check the attached patch.
--
Regards
Sudip
--- a/ttyrec-1.0.8/ttyrec.c
+++ b/ttyrec-1.0.8/ttyrec.c
@@ -57,7 +57,9 @@
#if defined(SVR4)
#include <fcntl.h>
+#ifndef TTYREC_LACKS_STROPTS_H
#include <stropts.h>
+#endif
#endif /* SVR4 */
#include <sys/time.h>
@@ -483,6 +485,7 @@ getslave()
perror("open(fd, O_RDWR)");
fail();
}
+#ifndef TTYREC_LACKS_STROPTS_H
if (isastream(slave)) {
if (ioctl(slave, I_PUSH, "ptem") < 0) {
perror("ioctl(fd, I_PUSH, ptem)");
@@ -499,6 +502,7 @@ getslave()
}
#endif
}
+#endif
(void) tcsetattr(slave, TCSAFLUSH, &tt);
(void) ioctl(slave, TIOCSWINSZ, (char *)&win);
(void) ioctl(slave, TIOCSCTTY, 0);
--- a/debian/patches/01_Makefile.diff
+++ b/debian/patches/01_Makefile.diff
@@ -8,7 +8,7 @@ Last-Update: 2010-04-27
@@ -1,7 +1,10 @@
CC = gcc
-CFLAGS = -O2
-+DEFS= -DSVR4 -D_GNU_SOURCE
++DEFS= -DSVR4 -D_GNU_SOURCE -DTTYREC_LACKS_STROPTS_H
+CFLAGS = -O2 -g -fomit-frame-pointer -Wall $(DEFS)
VERSION = 1.0.8
