Commit c9a7c82e authored by Boyuan Yang's avatar Boyuan Yang

d/patches: Refresh patches.

parent ae3c9fb9
--- a/fake_readline/Makefile.in 2001-10-06 23:17:05.000000000 +0200
+++ b/fake_readline/Makefile.in 2007-05-20 11:31:46.000000000 +0200
@@ -28,7 +28,7 @@
clean :
- -rm *.o *~ *.a \#*\# core $(NAME) typescript nohup.out
+ -rm -f *.o *~ *.a \#*\# core $(NAME) typescript nohup.out
distclean : clean
--- a/Makefile.in 2003-09-23 04:18:54.000000000 +0200
+++ b/Makefile.in 2007-05-20 11:00:03.000000000 +0200
@@ -86,21 +86,6 @@
From: Bart Martens <bart.martens@advalvas.be>
Date: Tue, 17 Jan 2006 00:23:59 +0100
Subject: Remove build instruction about lrzsz.
Now that we have removed bundled lrzsz in source tarball, the package's
build instrctions need patching as well.
---
Makefile.in | 20 ++------------------
fake_readline/Makefile.in | 2 +-
test/Makefile.in | 4 ++--
3 files changed, 5 insertions(+), 21 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 92c7254..6e46a93 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -86,21 +86,6 @@ uninstall :
fake_readline : force
-cd fake_readline && $(MAKE)
......@@ -33,7 +36,7 @@
# create source archive in ~/backup
tgz $(TGZ) : distclean force
@cdir=`pwd` && cdir=`basename $$cdir` && cd .. && \
@@ -136,11 +121,10 @@
@@ -136,11 +121,10 @@ TAGS :
new : clean all
clean :
......@@ -47,9 +50,24 @@
-(cd fake_readline && $(MAKE) distclean)
-(cd test && $(MAKE) distclean)
--- a/test/Makefile.in 2003-09-24 06:18:41.000000000 +0200
+++ b/test/Makefile.in 2007-05-20 11:31:46.000000000 +0200
@@ -68,10 +68,10 @@
diff --git a/fake_readline/Makefile.in b/fake_readline/Makefile.in
index 77eca27..1134a5c 100644
--- a/fake_readline/Makefile.in
+++ b/fake_readline/Makefile.in
@@ -28,7 +28,7 @@ new : clean all
clean :
- -rm *.o *~ *.a \#*\# core $(NAME) typescript nohup.out
+ -rm -f *.o *~ *.a \#*\# core $(NAME) typescript nohup.out
distclean : clean
diff --git a/test/Makefile.in b/test/Makefile.in
index 30f6dc1..7d8671f 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -68,10 +68,10 @@ TAGS :
new : clean all
clean :
......
--- a/Makefile.in 2007-05-20 11:52:48.000000000 +0200
+++ b/Makefile.in 2007-05-20 11:53:41.000000000 +0200
@@ -75,9 +75,9 @@
From: Bart Martens <bartm@knars.be>
Date: Sun, 20 May 2007 11:00:41 +0200
Subject: Install files into under $(DESTDIR).
This patch forces all installed files under $(DESTDIR) to cooperate
with Debian's build system.
---
Makefile.in | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 6e46a93..69f68d7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -75,9 +75,9 @@ ztelnet : $(NAME)
install :
strip $(NAME)
......
--- a/Makefile.in 2007-05-20 12:02:34.000000000 +0200
+++ b/Makefile.in 2007-05-20 12:03:11.000000000 +0200
@@ -76,7 +76,7 @@
From: Bart Martens <bartm@knars.be>
Date: Sun, 20 May 2007 11:00:41 +0200
Subject: Do not symlink zssh to ztelnet
---
Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.in b/Makefile.in
index 69f68d7..51f60c0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -76,7 +76,7 @@ ztelnet : $(NAME)
install :
strip $(NAME)
$(INSTALL) -m 0711 zssh $(DESTDIR)/@bindir@
......
diff -Nur zssh_1.5c.debian.1-3/configure.in zssh_1.5c.debian.1-3.new/configure.in
--- zssh_1.5c.debian.1-3/configure.in 2007-09-25 01:28:53.000000000 -0700
+++ zssh_1.5c.debian.1-3.new/configure.in 2007-09-25 01:30:03.000000000 -0700
@@ -57,7 +57,7 @@
From: Ben Wong <ben@wongs.net>
Date: Tue, 25 Sep 2007 01:48:30 -0700
Subject: Use GNU openpty library for pty.h
---
configure.in | 11 +++++++++--
openpty.c | 4 ++++
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/configure.in b/configure.in
index a8f1441..af2cad0 100644
--- a/configure.in
+++ b/configure.in
@@ -57,7 +57,7 @@ AC_CONFIG_HEADER(config.h)
AC_HEADER_STDC
AC_HEADER_SYS_WAIT
AC_CHECK_HEADERS(fcntl.h paths.h sys/ioctl.h sys/time.h termios.h unistd.h \
......@@ -10,7 +20,7 @@ diff -Nur zssh_1.5c.debian.1-3/configure.in zssh_1.5c.debian.1-3.new/configure.i
@@ -97,7 +97,14 @@
@@ -97,7 +97,14 @@ AC_CHECK_FUNCS(strdup getpt isastream tcsetpgrp)
dnl Check what is available for tty/pty allocation
......@@ -26,10 +36,11 @@ diff -Nur zssh_1.5c.debian.1-3/configure.in zssh_1.5c.debian.1-3.new/configure.i
AC_MSG_CHECKING(for pseudo ttys)
if test -c /dev/getpty && test $ac_cv_func_getpseudotty = yes
then
diff -Nur zssh_1.5c.debian.1-3/openpty.c zssh_1.5c.debian.1-3.new/openpty.c
--- zssh_1.5c.debian.1-3/openpty.c 2007-09-25 01:28:53.000000000 -0700
+++ zssh_1.5c.debian.1-3.new/openpty.c 2007-09-25 01:30:03.000000000 -0700
@@ -25,6 +25,10 @@
diff --git a/openpty.c b/openpty.c
index 42cb203..0b8a642 100644
--- a/openpty.c
+++ b/openpty.c
@@ -25,6 +25,10 @@ static char gl_slavename[GL_SLAVENAMELEN + 1] = {0};
#include <util.h>
#endif
......
diff -Nur zssh_1.5c.debian.1-3/Makefile.in zssh_1.5c.debian.1-3.new/Makefile.in
--- zssh_1.5c.debian.1-3/Makefile.in 2007-09-25 01:24:58.000000000 -0700
+++ zssh_1.5c.debian.1-3.new/Makefile.in 2007-09-25 01:25:42.000000000 -0700
@@ -74,7 +74,7 @@
From: Ben Wong <ben@wongs.net>
Date: Tue, 25 Sep 2007 01:48:30 -0700
Subject: Do not call strip in build process
This is handled later in Debian build system by debhelper.
This closes #438380.
---
Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.in b/Makefile.in
index 51f60c0..6f5542c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -74,7 +74,7 @@ ztelnet : $(NAME)
ln $(NAME) $@
install :
......
Index: zssh-1.5c.debian.1/completion.c
===================================================================
--- zssh-1.5c.debian.1.orig/completion.c 2003-09-02 02:57:07.000000000 +0000
+++ zssh-1.5c.debian.1/completion.c 2014-07-21 07:44:35.277210638 +0000
@@ -53,7 +53,7 @@
From: YuanQing Su <syq@debian.org>
Date: Mon, 21 Jul 2014 08:22:29 +0000
Subject: replace CPPFunction call with rl_completion_func_t
This closes #741761.
---
completion.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/completion.c b/completion.c
index 98e714a..de44329 100644
--- a/completion.c
+++ b/completion.c
@@ -53,7 +53,7 @@ void initialize_readline()
so that if zssh_completion() fails nothing is completed */
rl_completion_entry_function = fake_generator;
/* Tell the completer that we want a crack first. */
......
01_pre_cdbs.diff
02_destdir.diff
03_symlink.diff
04_GNU_openpty.patch
05_strip.patch
fix_CPPFunction.diff
0001-Remove-build-instruction-about-lrzsz.patch
0002-Install-files-into-under-DESTDIR.patch
0003-Do-not-symlink-zssh-to-ztelnet.patch
0004-Use-GNU-openpty-library-for-pty.h.patch
0005-Do-not-call-strip-in-build-process.patch
0006-replace-CPPFunction-call-with-rl_completion_func_t.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment