summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2020-09-15 21:52:36 +0200
committerDavid Seifert <soap@gentoo.org>2020-09-15 21:52:36 +0200
commita9374bd89c2a17d3a5f2d97409a5ccce93c9baa1 (patch)
tree127648178646bc434614f796160594232254cc5f /app-misc/ttysnoop/files
parentsys-devel/pmake: Port to EAPI 7 (diff)
downloadgentoo-a9374bd89c2a17d3a5f2d97409a5ccce93c9baa1.tar.gz
gentoo-a9374bd89c2a17d3a5f2d97409a5ccce93c9baa1.tar.bz2
gentoo-a9374bd89c2a17d3a5f2d97409a5ccce93c9baa1.zip
app-misc/ttysnoop: Port to EAPI 7
Closes: https://bugs.gentoo.org/742071 Package-Manager: Portage-3.0.7, Repoman-3.0.1 Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'app-misc/ttysnoop/files')
-rw-r--r--app-misc/ttysnoop/files/pinkbyte_masking.patch4
-rw-r--r--app-misc/ttysnoop/files/ttysnoop-makefile.patch27
2 files changed, 20 insertions, 11 deletions
diff --git a/app-misc/ttysnoop/files/pinkbyte_masking.patch b/app-misc/ttysnoop/files/pinkbyte_masking.patch
index a0539c239b04..8d944b21e3af 100644
--- a/app-misc/ttysnoop/files/pinkbyte_masking.patch
+++ b/app-misc/ttysnoop/files/pinkbyte_masking.patch
@@ -1,5 +1,5 @@
---- ttysnoops.c 2009-08-13 17:11:30.705202250 +0400
-+++ ttysnoops.c 2009-08-13 17:17:29.989201055 +0400
+--- a/ttysnoops.c
++++ b/ttysnoops.c
@@ -18,6 +18,7 @@
v0.12d 8-4-98 Carl Declerck - updated #includes a bit
k26 28-5-00 Vinicius Anselmo - added sound alert (demoniac) created by Stas
diff --git a/app-misc/ttysnoop/files/ttysnoop-makefile.patch b/app-misc/ttysnoop/files/ttysnoop-makefile.patch
index 54d04dd40a29..ba8d702e9e6e 100644
--- a/app-misc/ttysnoop/files/ttysnoop-makefile.patch
+++ b/app-misc/ttysnoop/files/ttysnoop-makefile.patch
@@ -1,6 +1,15 @@
---- Makefile 2004-06-07 04:27:40.000000000 +0400
-+++ Makefile 2011-07-21 11:50:22.580167326 +0400
-@@ -11,7 +11,7 @@
+--- a/Makefile
++++ b/Makefile
+@@ -2,8 +2,6 @@
+ # Makefile for the ttysnoop programs
+ #
+
+-CC = gcc
+-
+ # Without shadow support
+
+ #CCOPTS = -O2
+@@ -11,7 +9,7 @@
# For shadow support
@@ -9,28 +18,28 @@
LIBS = -lcrypt
#LIBS = -lshadow
-@@ -24,19 +24,19 @@
+@@ -24,19 +22,19 @@
all: ttysnoops ttysnoop
ttysnoops: $(SERVEROBJS)
- $(CC) $(SERVEROBJS) -o ttysnoops $(LIBS)
-+ $(CC) $(SERVEROBJS) -o ttysnoops $(LDFLAGS) $(LIBS)
++ $(CC) $(LDFLAGS) $(SERVEROBJS) -o ttysnoops $(LIBS)
ttysnoop: $(CLIENTOBJS)
- $(CC) $(CLIENTOBJS) -o ttysnoop $(LIBS)
-+ $(CC) $(CLIENTOBJS) -o ttysnoop $(LDFLAGS) $(LIBS)
++ $(CC) $(LDFLAGS) $(CLIENTOBJS) -o ttysnoop $(LIBS)
ttysnoops.o: $(SERVERSRCS) $(INCLUDES)
- $(CC) $(CCOPTS) -c -o ttysnoops.o $(SERVERSRCS)
-+ $(CC) $(CCOPTS) $(CFLAGS) -c -o ttysnoops.o $(SERVERSRCS)
++ $(CC) $(CCOPTS) $(CPPFLAGS) $(CFLAGS) -c -o ttysnoops.o $(SERVERSRCS)
ttysnoop.o: $(CLIENTSRCS) $(INCLUDES)
- $(CC) $(CCOPTS) -c -o ttysnoop.o $(CLIENTSRCS)
-+ $(CC) $(CCOPTS) $(CFLAGS) -c -o ttysnoop.o $(CLIENTSRCS)
++ $(CC) $(CCOPTS) $(CPPFLAGS) $(CFLAGS) -c -o ttysnoop.o $(CLIENTSRCS)
common.o: common.c common.h
- $(CC) $(CCOPTS) -c -o common.o common.c
-+ $(CC) $(CCOPTS) $(CFLAGS) -c -o common.o common.c
++ $(CC) $(CCOPTS) $(CPPFLAGS) $(CFLAGS) -c -o common.o common.c
clean:
rm -f *.o core ttysnoop ttysnoops