diff options
-rw-r--r-- | patches/screen-4.0.2.dif | 29 | ||||
-rw-r--r-- | patches/screen-__P.diff | 10 | ||||
-rw-r--r-- | patches/screen-gcc4.diff | 44 |
3 files changed, 83 insertions, 0 deletions
diff --git a/patches/screen-4.0.2.dif b/patches/screen-4.0.2.dif new file mode 100644 index 0000000..0fd7aec --- /dev/null +++ b/patches/screen-4.0.2.dif @@ -0,0 +1,29 @@ +--- screenrc ++++ screenrc 2000/09/01 14:38:23 +@@ -0,0 +1,4 @@ ++# this is the global screenrc file. Handle with care. ++ ++termcapinfo xterm* G0:is=\E[?4l\E>:ti@:te@ ++termcapinfo linux me=\E[m:AX +--- ./configure.in.orig 2004-02-16 14:48:22.000000000 +0000 ++++ ./configure.in 2004-02-16 14:49:11.000000000 +0000 +@@ -93,7 +93,7 @@ + AC_MSG_RESULT(yes) + AC_MSG_CHECKING(for the socket dir) + SOCKDIR="(eff_uid ? \"/tmp/uscreens\" : \"/tmp/screens\")" +- AC_ARG_WITH(socket-dir, [ --with-socket-dir=path where to put the per-user sockets], [ SOCKDIR="\"${withval}\"" ]) ++ AC_ARG_WITH(socket-dir, [ --with-socket-dir=path where to put the per-user sockets], [ SOCKDIR="${withval}" ]) + AC_MSG_RESULT(${SOCKDIR}) + AC_DEFINE_UNQUOTED(SOCKDIR, $SOCKDIR) + ] +--- ./configure.orig 2004-02-16 14:48:27.000000000 +0000 ++++ ./configure 2004-02-16 14:49:26.000000000 +0000 +@@ -3012,7 +3012,7 @@ + # Check whether --with-socket-dir or --without-socket-dir was given. + if test "${with_socket_dir+set}" = set; then + withval="$with_socket_dir" +- SOCKDIR="\"${withval}\"" ++ SOCKDIR="${withval}" + fi; + echo "$as_me:$LINENO: result: ${SOCKDIR}" >&5 + echo "${ECHO_T}${SOCKDIR}" >&6 diff --git a/patches/screen-__P.diff b/patches/screen-__P.diff new file mode 100644 index 0000000..26138c3 --- /dev/null +++ b/patches/screen-__P.diff @@ -0,0 +1,10 @@ +--- screen.h 2004/09/12 07:24:26 1.1 ++++ screen.h 2004/09/12 07:24:36 +@@ -25,6 +25,7 @@ + + #include "os.h" + ++#undef __P + #if defined(__STDC__) + # ifndef __P + # define __P(a) a diff --git a/patches/screen-gcc4.diff b/patches/screen-gcc4.diff new file mode 100644 index 0000000..6cd39c2 --- /dev/null +++ b/patches/screen-gcc4.diff @@ -0,0 +1,44 @@ +--- screen-4.0.2/fileio.c.xx 2005-04-08 13:37:18.823774606 +0200 ++++ screen-4.0.2/fileio.c 2005-04-08 13:37:25.948324113 +0200 +@@ -779,7 +779,7 @@ + #ifdef SIGPIPE + signal(SIGPIPE, SIG_DFL); + #endif +- execl("/bin/sh", "sh", "-c", cmd, 0); ++ execl("/bin/sh", "sh", "-c", cmd, (char*)0); + Panic(errno, "/bin/sh"); + default: + break; +--- screen-4.0.2/utmp.c.orig 2005-10-28 22:01:14.105418912 +0000 ++++ screen-4.0.2/utmp.c 2005-10-28 22:02:30.065801507 +0000 +@@ -604,6 +604,7 @@ struct utmp *u; + char *line, *user; + int pid; + { ++ time_t t; + u->ut_type = USER_PROCESS; + strncpy(u->ut_user, user, sizeof(u->ut_user)); + /* Now the tricky part... guess ut_id */ +@@ -618,7 +619,8 @@ int pid; + #endif /* sgi */ + strncpy(u->ut_line, line, sizeof(u->ut_line)); + u->ut_pid = pid; +- (void)time((time_t *)&u->ut_time); ++ (void)time(&t); ++ u->ut_time = t; + } + + static slot_t +@@ -726,9 +728,11 @@ struct utmp *u; + char *line, *user; + int pid; + { ++ time_t t; + strncpy(u->ut_line, line, sizeof(u->ut_line)); + strncpy(u->ut_name, user, sizeof(u->ut_name)); +- (void)time((time_t *)&u->ut_time); ++ (void)time(&t); ++ u->ut_time = t; + } + + static slot_t |