* [gentoo-commits] repo/gentoo:master commit in: app-misc/ttyrec/, app-misc/ttyrec/files/
@ 2020-03-09 20:33 Patrice Clement
0 siblings, 0 replies; 3+ messages in thread
From: Patrice Clement @ 2020-03-09 20:33 UTC (permalink / raw
To: gentoo-commits
commit: ab51e719f086daa2684c155321b4359f97f7b5ba
Author: Stephan Hartmann <stha09 <AT> googlemail <DOT> com>
AuthorDate: Tue Feb 18 15:11:39 2020 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Mar 9 20:33:36 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab51e719
app-misc/ttyrec: fix building with glibc 2.30.
Closes: https://bugs.gentoo.org/691908
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Stephan Hartmann <stha09 <AT> googlemail.com>
Closes: https://github.com/gentoo/gentoo/pull/14692
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
.../ttyrec/files/ttyrec-1.0.8-glibc-2.30.patch | 30 ++++++++++++++++++++++
app-misc/ttyrec/ttyrec-1.0.8-r2.ebuild | 5 +++-
2 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/app-misc/ttyrec/files/ttyrec-1.0.8-glibc-2.30.patch b/app-misc/ttyrec/files/ttyrec-1.0.8-glibc-2.30.patch
new file mode 100644
index 00000000000..174fc7786e1
--- /dev/null
+++ b/app-misc/ttyrec/files/ttyrec-1.0.8-glibc-2.30.patch
@@ -0,0 +1,30 @@
+diff --git a/ttyrec.c b/ttyrec.c
+index 3392f70..86a59ee 100644
+--- a/ttyrec.c
++++ b/ttyrec.c
+@@ -57,7 +57,9 @@
+
+ #if defined(SVR4)
+ #include <fcntl.h>
++#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__linux__))
+ #include <stropts.h>
++#endif
+ #endif /* SVR4 */
+
+ #include <sys/time.h>
+@@ -449,6 +451,7 @@ getslave()
+ perror("open(fd, O_RDWR)");
+ fail();
+ }
++#ifndef __linux__
+ if (isastream(slave)) {
+ if (ioctl(slave, I_PUSH, "ptem") < 0) {
+ perror("ioctl(fd, I_PUSH, ptem)");
+@@ -466,6 +469,7 @@ getslave()
+ #endif
+ (void) ioctl(0, TIOCGWINSZ, (char *)&win);
+ }
++#endif
+ #else /* !SVR4 */
+ #ifndef HAVE_openpty
+ line[strlen("/dev/")] = 't';
diff --git a/app-misc/ttyrec/ttyrec-1.0.8-r2.ebuild b/app-misc/ttyrec/ttyrec-1.0.8-r2.ebuild
index df5351688d2..e3f42c0d0d3 100644
--- a/app-misc/ttyrec/ttyrec-1.0.8-r2.ebuild
+++ b/app-misc/ttyrec/ttyrec-1.0.8-r2.ebuild
@@ -12,7 +12,10 @@ SRC_URI="http://0xcc.net/ttyrec/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-PATCHES=( "${FILESDIR}/${P}-flags.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-flags.patch"
+ "${FILESDIR}/${P}-glibc-2.30.patch"
+)
src_compile() {
# Bug 106530
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-misc/ttyrec/, app-misc/ttyrec/files/
@ 2022-07-31 20:03 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2022-07-31 20:03 UTC (permalink / raw
To: gentoo-commits
commit: 47a9ea7acd609fbdf48891e4a29633ab5e23f0d5
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 31 20:03:38 2022 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jul 31 20:03:38 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47a9ea7a
app-misc/ttyrec: update EAPI 6 -> 8
Closes: https://bugs.gentoo.org/713408
Signed-off-by: David Seifert <soap <AT> gentoo.org>
app-misc/ttyrec/files/ttyrec-1.0.8-flags.patch | 25 +++++++-----
.../ttyrec/files/ttyrec-1.0.8-glibc-2.30.patch | 47 +++++++++++++++++++---
...yrec-1.0.8-r2.ebuild => ttyrec-1.0.8-r3.ebuild} | 13 +++---
3 files changed, 65 insertions(+), 20 deletions(-)
diff --git a/app-misc/ttyrec/files/ttyrec-1.0.8-flags.patch b/app-misc/ttyrec/files/ttyrec-1.0.8-flags.patch
index 34687d9b8b7a..28d7841fbd6f 100644
--- a/app-misc/ttyrec/files/ttyrec-1.0.8-flags.patch
+++ b/app-misc/ttyrec/files/ttyrec-1.0.8-flags.patch
@@ -1,19 +1,26 @@
---- a/Makefile 2017-08-26 11:47:02.981266309 +0200
-+++ b/Makefile 2017-08-26 14:33:47.161600445 +0200
-@@ -10,13 +10,13 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,5 +1,3 @@
+-CC = gcc
+-CFLAGS = -O2
+ VERSION = 1.0.8
+
+ TARGET = ttyrec ttyplay ttytime
+@@ -9,14 +7,11 @@
+
all: $(TARGET)
- ttyrec: ttyrec.o io.o
+-ttyrec: ttyrec.o io.o
- $(CC) $(CFLAGS) -o ttyrec ttyrec.o io.o
-+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o ttyrec ttyrec.o io.o
++ttyrec: io.o
- ttyplay: ttyplay.o io.o
+-ttyplay: ttyplay.o io.o
- $(CC) $(CFLAGS) -o ttyplay ttyplay.o io.o
-+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o ttyplay ttyplay.o io.o
++ttyplay: io.o
- ttytime: ttytime.o io.o
+-ttytime: ttytime.o io.o
- $(CC) $(CFLAGS) -o ttytime ttytime.o io.o
-+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o ttytime ttytime.o io.o
++ttytime: io.o
clean:
rm -f *.o $(TARGET) ttyrecord *~
diff --git a/app-misc/ttyrec/files/ttyrec-1.0.8-glibc-2.30.patch b/app-misc/ttyrec/files/ttyrec-1.0.8-glibc-2.30.patch
index 174fc7786e19..79a024ac734b 100644
--- a/app-misc/ttyrec/files/ttyrec-1.0.8-glibc-2.30.patch
+++ b/app-misc/ttyrec/files/ttyrec-1.0.8-glibc-2.30.patch
@@ -1,8 +1,36 @@
-diff --git a/ttyrec.c b/ttyrec.c
-index 3392f70..86a59ee 100644
+--- a/io.h
++++ b/io.h
+@@ -9,5 +9,6 @@
+ int edup (int oldfd);
+ int edup2 (int oldfd, int newfd);
+ FILE* efdopen (int fd, const char *mode);
++void set_progname (const char *name);
+
+ #endif
--- a/ttyrec.c
+++ b/ttyrec.c
-@@ -57,7 +57,9 @@
+@@ -42,13 +42,19 @@
+ /*
+ * script
+ */
++
++#ifndef _GNU_SOURCE
++#define _GNU_SOURCE
++#endif
++
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <termios.h>
+ #include <sys/ioctl.h>
+ #include <sys/time.h>
+ #include <sys/file.h>
+-#include <sys/signal.h>
++#include <sys/wait.h>
++#include <signal.h>
+ #include <stdio.h>
+ #include <time.h>
+ #include <unistd.h>
+@@ -57,7 +63,9 @@
#if defined(SVR4)
#include <fcntl.h>
@@ -12,7 +40,16 @@ index 3392f70..86a59ee 100644
#endif /* SVR4 */
#include <sys/time.h>
-@@ -449,6 +451,7 @@ getslave()
+@@ -341,7 +349,7 @@
+ rtt = tt;
+ #if defined(SVR4)
+ rtt.c_iflag = 0;
+- rtt.c_lflag &= ~(ISIG|ICANON|XCASE|ECHO|ECHOE|ECHOK|ECHONL);
++ rtt.c_lflag &= ~(ISIG|ICANON|ECHO|ECHOE|ECHOK|ECHONL);
+ rtt.c_oflag = OPOST;
+ rtt.c_cc[VINTR] = CDEL;
+ rtt.c_cc[VQUIT] = CDEL;
+@@ -449,6 +457,7 @@
perror("open(fd, O_RDWR)");
fail();
}
@@ -20,7 +57,7 @@ index 3392f70..86a59ee 100644
if (isastream(slave)) {
if (ioctl(slave, I_PUSH, "ptem") < 0) {
perror("ioctl(fd, I_PUSH, ptem)");
-@@ -466,6 +469,7 @@ getslave()
+@@ -466,6 +475,7 @@
#endif
(void) ioctl(0, TIOCGWINSZ, (char *)&win);
}
diff --git a/app-misc/ttyrec/ttyrec-1.0.8-r2.ebuild b/app-misc/ttyrec/ttyrec-1.0.8-r3.ebuild
similarity index 75%
rename from app-misc/ttyrec/ttyrec-1.0.8-r2.ebuild
rename to app-misc/ttyrec/ttyrec-1.0.8-r3.ebuild
index 87546d44a9f8..2973ae3eff7e 100644
--- a/app-misc/ttyrec/ttyrec-1.0.8-r2.ebuild
+++ b/app-misc/ttyrec/ttyrec-1.0.8-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
inherit flag-o-matic toolchain-funcs
@@ -12,15 +12,16 @@ SRC_URI="http://0xcc.net/ttyrec/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
PATCHES=(
- "${FILESDIR}/${P}-flags.patch"
- "${FILESDIR}/${P}-glibc-2.30.patch"
+ "${FILESDIR}"/${P}-flags.patch
+ "${FILESDIR}"/${P}-glibc-2.30.patch
)
-src_compile() {
+src_configure() {
# Bug 106530
[[ ${CHOST} != *-darwin* ]] && append-cppflags -DSVR4 -D_XOPEN_SOURCE=500
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+ tc-export CC
}
src_install() {
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-misc/ttyrec/, app-misc/ttyrec/files/
@ 2017-10-17 7:12 Patrice Clement
0 siblings, 0 replies; 3+ messages in thread
From: Patrice Clement @ 2017-10-17 7:12 UTC (permalink / raw
To: gentoo-commits
commit: 029c01eec2008fa0efa1d6a91c4291e6b0949e48
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 17 07:08:09 2017 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Oct 17 07:12:09 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=029c01ee
app-misc/ttyrec: clean up old.
Package-Manager: Portage-2.3.8, Repoman-2.3.3
app-misc/ttyrec/files/ttyrec-1.0.8-ldflags.patch | 19 ----------------
app-misc/ttyrec/ttyrec-1.0.8-r1.ebuild | 29 ------------------------
2 files changed, 48 deletions(-)
diff --git a/app-misc/ttyrec/files/ttyrec-1.0.8-ldflags.patch b/app-misc/ttyrec/files/ttyrec-1.0.8-ldflags.patch
deleted file mode 100644
index 5b2393ce539..00000000000
--- a/app-misc/ttyrec/files/ttyrec-1.0.8-ldflags.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- Makefile~ 2010-08-09 14:01:24.351716328 -0400
-+++ Makefile 2010-08-09 14:00:45.981716329 -0400
-@@ -10,13 +10,13 @@
- all: $(TARGET)
-
- ttyrec: ttyrec.o io.o
-- $(CC) $(CFLAGS) -o ttyrec ttyrec.o io.o
-+ $(CC) $(LDFLAGS) $(CFLAGS) -o ttyrec ttyrec.o io.o
-
- ttyplay: ttyplay.o io.o
-- $(CC) $(CFLAGS) -o ttyplay ttyplay.o io.o
-+ $(CC) $(LDFLAGS) $(CFLAGS) -o ttyplay ttyplay.o io.o
-
- ttytime: ttytime.o io.o
-- $(CC) $(CFLAGS) -o ttytime ttytime.o io.o
-+ $(CC) $(LDFLAGS) $(CFLAGS) -o ttytime ttytime.o io.o
-
- clean:
- rm -f *.o $(TARGET) ttyrecord *~
diff --git a/app-misc/ttyrec/ttyrec-1.0.8-r1.ebuild b/app-misc/ttyrec/ttyrec-1.0.8-r1.ebuild
deleted file mode 100644
index ef4ff7b2614..00000000000
--- a/app-misc/ttyrec/ttyrec-1.0.8-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit base flag-o-matic toolchain-funcs
-
-DESCRIPTION="The tty recorder provides tools to record and replay a terminal session."
-HOMEPAGE="http://0xcc.net/ttyrec/"
-SRC_URI="http://namazu.org/~satoru/ttyrec/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-# Bug 331843
-PATCHES=( "${FILESDIR}/${P}-ldflags.patch" )
-
-src_compile() {
- # Bug 106530
- [[ ${CHOST} != *-darwin* ]] && append-cppflags -DSVR4 -D_XOPEN_SOURCE=500
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
- dobin ttyrec ttyplay ttytime
- dodoc README
- doman *.1
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-07-31 20:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-09 20:33 [gentoo-commits] repo/gentoo:master commit in: app-misc/ttyrec/, app-misc/ttyrec/files/ Patrice Clement
-- strict thread matches above, loose matches on Subject: below --
2022-07-31 20:03 David Seifert
2017-10-17 7:12 Patrice Clement
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox