From 1a8e55ce789fd089311838c09e4a418c90178c38 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 2 May 2014 07:47:06 +0200 Subject: update to latest, use OpenWrt patches --- package/screen/Makefile | 6 +- package/screen/patches/patch-configure | 573 ++------------------------------- package/screen/patches/patch-process_c | 15 - package/screen/patches/patch-pty_c | 17 +- package/screen/patches/patch-sched_h | 10 +- package/screen/patches/patch-screen_c | 13 - package/screen/patches/patch-tty_sh | 13 - 7 files changed, 36 insertions(+), 611 deletions(-) delete mode 100644 package/screen/patches/patch-process_c delete mode 100644 package/screen/patches/patch-screen_c delete mode 100644 package/screen/patches/patch-tty_sh (limited to 'package/screen') diff --git a/package/screen/Makefile b/package/screen/Makefile index 62d1c86e9..871323966 100644 --- a/package/screen/Makefile +++ b/package/screen/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= screen -PKG_VERSION:= 4.0.3 -PKG_RELEASE:= 3 -PKG_MD5SUM:= 8506fd205028a96c741e4037de6e3c42 +PKG_VERSION:= 4.2.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 419a0594e2b25039239af8b90eda7d92 PKG_DESCR:= window manager for the terminal session PKG_SECTION:= misc PKG_DEPENDS:= libncurses libelf diff --git a/package/screen/patches/patch-configure b/package/screen/patches/patch-configure index 884ebef58..9d5400329 100644 --- a/package/screen/patches/patch-configure +++ b/package/screen/patches/patch-configure @@ -1,564 +1,29 @@ ---- screen-4.0.3.orig/configure 2003-12-05 14:46:53.000000000 +0100 -+++ screen-4.0.3/configure 2014-02-19 08:18:45.000000000 +0100 -@@ -124,7 +124,7 @@ done +--- screen-4.2.1.orig/configure 2014-04-26 12:58:46.000000000 +0200 ++++ screen-4.2.1/configure 2014-05-01 13:04:48.000000000 +0200 +@@ -414,7 +414,7 @@ as_fn_error () + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - if test ! -f "$as_myself"; then - { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 -- { (exit 1); exit 1; }; } -+ } - fi - case $CONFIG_SHELL in - '') -@@ -174,7 +174,7 @@ done - ' >$as_me.lineno && - chmod +x $as_me.lineno || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 -- { (exit 1); exit 1; }; } -+ } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the -@@ -397,7 +397,7 @@ do - # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 -- { (exit 1); exit 1; }; } -+ } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` - eval "enable_$ac_feature=no" ;; - -@@ -406,7 +406,7 @@ do - # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 -- { (exit 1); exit 1; }; } -+ } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; -@@ -588,7 +588,7 @@ do - # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 -- { (exit 1); exit 1; }; } -+ } - ac_package=`echo $ac_package| sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; -@@ -601,7 +601,7 @@ do - # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 -- { (exit 1); exit 1; }; } -+ } - ac_package=`echo $ac_package | sed 's/-/_/g'` - eval "with_$ac_package=no" ;; - -@@ -625,7 +625,7 @@ do - - -*) { echo "$as_me: error: unrecognized option: $ac_option - Try \`$0 --help' for more information." >&2 -- { (exit 1); exit 1; }; } -+ } - ;; - - *=*) -@@ -633,7 +633,7 @@ Try \`$0 --help' for more information." - # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 -- { (exit 1); exit 1; }; } -+ } - ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` - eval "$ac_envvar='$ac_optarg'" - export $ac_envvar ;; -@@ -652,7 +652,7 @@ done - if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { echo "$as_me: error: missing argument to $ac_option" >&2 -- { (exit 1); exit 1; }; } -+ } - fi - - # Be sure to have absolute paths. -@@ -662,7 +662,7 @@ do - case $ac_val in - [\\/$]* | ?:[\\/]* | NONE | '' ) ;; - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -- { (exit 1); exit 1; }; };; -+ };; - esac - done - -@@ -674,7 +674,7 @@ do - case $ac_val in - [\\/$]* | ?:[\\/]* ) ;; - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -- { (exit 1); exit 1; }; };; -+ };; - esac - done - -@@ -728,15 +728,15 @@ fi - if test ! -r $srcdir/$ac_unique_file; then - if test "$ac_srcdir_defaulted" = yes; then - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 -- { (exit 1); exit 1; }; } -+ } - else - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 -- { (exit 1); exit 1; }; } -+ } - fi - fi - (cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || - { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 -- { (exit 1); exit 1; }; } -+ } - srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` - ac_env_build_alias_set=${build_alias+set} - ac_env_build_alias_value=$build_alias -@@ -1243,7 +1243,7 @@ if $ac_cache_corrupted; then - echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 - echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} -- { (exit 1); exit 1; }; } -+ } - fi + $as_echo "$as_me: error: $2" >&2 +- as_fn_exit $as_status ++ # as_fn_exit $as_status + } # as_fn_error - ac_ext=c -@@ -1734,7 +1734,7 @@ test -z "$CC" && { { echo "$as_me:$LINEN - See \`config.log' for more details." >&5 - echo "$as_me: error: no acceptable C compiler found in \$PATH - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ } - - # Provide some information about the compiler. - echo "$as_me:$LINENO:" \ -@@ -1856,7 +1856,7 @@ See \`config.log' for more details." >&5 - echo "$as_me: error: cannot run C compiled programs. - If you meant to cross compile, use \`--host'. - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ } - fi - fi - fi -@@ -1898,7 +1898,7 @@ else - See \`config.log' for more details." >&5 - echo "$as_me: error: cannot compute suffix of executables: cannot compile and link - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ } - fi - - rm -f conftest$ac_cv_exeext -@@ -1950,7 +1950,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 - See \`config.log' for more details." >&5 - echo "$as_me: error: cannot compute suffix of object files: cannot compile - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ } - fi - - rm -f conftest.$ac_cv_objext conftest.$ac_ext -@@ -2514,7 +2514,7 @@ else - See \`config.log' for more details." >&5 - echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ } - fi - - ac_ext=c -@@ -2704,7 +2704,7 @@ if test "$cross_compiling" = yes; then - See \`config.log' for more details." >&5 - echo "$as_me: error: cannot run test program while cross compiling - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ } - else - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" -@@ -2753,7 +2753,7 @@ if test "$cross_compiling" = yes; then - See \`config.log' for more details." >&5 - echo "$as_me: error: cannot run test program while cross compiling - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ } - else - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" -@@ -2790,7 +2790,7 @@ echo "$ac_compile" 1>&6 - - { { echo "$as_me:$LINENO: error: Can't run the compiler - sorry" >&5 - echo "$as_me: error: Can't run the compiler - sorry" >&2;} -- { (exit 1); exit 1; }; } -+ } - fi - rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi -@@ -2800,7 +2800,7 @@ if test "$cross_compiling" = yes; then - See \`config.log' for more details." >&5 - echo "$as_me: error: cannot run test program while cross compiling - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ } - else - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" -@@ -2830,7 +2830,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - (exit $ac_status); }; }; then - { { echo "$as_me:$LINENO: error: Your compiler does not set the exit status - sorry" >&5 - echo "$as_me: error: Your compiler does not set the exit status - sorry" >&2;} -- { (exit 1); exit 1; }; } -+ } - else - echo "$as_me: program exited with status $ac_status" >&5 - echo "$as_me: failed program was:" >&5 -@@ -2900,7 +2900,7 @@ done - if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 - echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} -- { (exit 1); exit 1; }; } -+ } - fi - ac_config_guess="$SHELL $ac_aux_dir/config.guess" - ac_config_sub="$SHELL $ac_aux_dir/config.sub" -@@ -3335,6 +3335,11 @@ _ACEOF + if expr a : '\(a\)' >/dev/null 2>&1 && +@@ -5941,8 +5941,6 @@ else fi - rm -f conftest.$ac_objext conftest.$ac_ext - -+# always SYSV -+cat >>confdefs.h <<\_ACEOF -+#define SYSV 1 -+_ACEOF -+ - { echo "$as_me:$LINENO: checking for sequent/ptx..." >&5 - echo "$as_me: checking for sequent/ptx..." >&6;} - cat >conftest.$ac_ext <<_ACEOF -@@ -4149,7 +4154,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 - - { { echo "$as_me:$LINENO: error: !!! no select - no screen" >&5 - echo "$as_me: error: !!! no select - no screen" >&2;} -- { (exit 1); exit 1; }; } -+ } - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - -@@ -4163,7 +4168,7 @@ if test "$cross_compiling" = yes; then - See \`config.log' for more details." >&5 - echo "$as_me: error: cannot run test program while cross compiling - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ } - else - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" -@@ -4272,7 +4277,7 @@ if test "$cross_compiling" = yes; then - See \`config.log' for more details." >&5 - echo "$as_me: error: cannot run test program while cross compiling - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ } - else - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" -@@ -4365,7 +4370,7 @@ if test "$cross_compiling" = yes; then - See \`config.log' for more details." >&5 - echo "$as_me: error: cannot run test program while cross compiling - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ } - else - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" -@@ -4460,7 +4465,7 @@ if test "$cross_compiling" = yes; then - See \`config.log' for more details." >&5 - echo "$as_me: error: cannot run test program while cross compiling - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ } - else - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" -@@ -4562,7 +4567,7 @@ elif test -n "$sock"; then - else - { { echo "$as_me:$LINENO: error: you have neither usable sockets nor usable pipes -> no screen" >&5 - echo "$as_me: error: you have neither usable sockets nor usable pipes -> no screen" >&2;} -- { (exit 1); exit 1; }; } -+ } - fi - - -@@ -4573,7 +4578,7 @@ if test "$cross_compiling" = yes; then - See \`config.log' for more details." >&5 - echo "$as_me: error: cannot run test program while cross compiling - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ } - else - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" -@@ -4898,7 +4903,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 - - { { echo "$as_me:$LINENO: error: !!! no tgetent - no screen" >&5 - echo "$as_me: error: !!! no tgetent - no screen" >&2;} -- { (exit 1); exit 1; }; } -+ } - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi -@@ -4915,7 +4920,7 @@ if test "$cross_compiling" = yes; then - See \`config.log' for more details." >&5 - echo "$as_me: error: cannot run test program while cross compiling - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ } - else - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" -@@ -5008,50 +5013,6 @@ _ACEOF - - fi - --{ echo "$as_me:$LINENO: checking for SVR4 ptys..." >&5 --echo "$as_me: checking for SVR4 ptys..." >&6;} --sysvr4ptys= --if test -c /dev/ptmx ; then --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --int --main () --{ --ptsname(0);grantpt(0);unlockpt(0); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- cat >>confdefs.h <<\_ACEOF --#define HAVE_SVR4_PTYS 1 --_ACEOF -- --sysvr4ptys=1 --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --fi --rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --fi - - - for ac_func in getpt -@@ -5359,7 +5320,7 @@ if test "$cross_compiling" = yes; then - See \`config.log' for more details." >&5 - echo "$as_me: error: cannot run test program while cross compiling - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ } - else - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" -@@ -6206,7 +6167,7 @@ echo "$as_me: checking for avenrun symbo - See \`config.log' for more details." >&5 - echo "$as_me: error: cannot run test program while cross compiling - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ } - else - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" -@@ -6482,7 +6443,7 @@ if test "$cross_compiling" = yes; then - See \`config.log' for more details." >&5 - echo "$as_me: error: cannot run test program while cross compiling - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ } - else - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" -@@ -6598,8 +6559,6 @@ sed 's/^/| /' conftest.$ac_ext >&5 - LIBS="$oldlibs" - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext -test -f /lib/libsec.a || test -f /usr/lib/libsec.a && LIBS="$LIBS -lsec" -test -f /lib/libshadow.a || test -f /usr/lib/libshadow.a && LIBS="$LIBS -lshadow" oldlibs="$LIBS" LIBS="$LIBS -lsun" - { echo "$as_me:$LINENO: checking IRIX sun library..." >&5 -@@ -7004,7 +6963,7 @@ if test "$cross_compiling" = yes; then - See \`config.log' for more details." >&5 - echo "$as_me: error: cannot run test program while cross compiling - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ } - else - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" -@@ -7056,7 +7015,7 @@ if test "$cross_compiling" = yes; then - See \`config.log' for more details." >&5 - echo "$as_me: error: cannot run test program while cross compiling - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ } - else - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" -@@ -7110,7 +7069,7 @@ if test "$cross_compiling" = yes; then - See \`config.log' for more details." >&5 - echo "$as_me: error: cannot run test program while cross compiling - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ } - else - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" -@@ -7158,6 +7117,11 @@ fi - rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - -+# always use memcpy -+cat >>confdefs.h <<\_ACEOF -+#define USEMEMCPY 1 -+_ACEOF -+ - echo "$as_me:$LINENO: checking long file names" >&5 - echo $ECHO_N "checking long file names... $ECHO_C" >&6 - (echo 1 > /tmp/conftest9012345) 2>/dev/null -@@ -7951,7 +7915,7 @@ if test "$cross_compiling" = yes; then - See \`config.log' for more details." >&5 - echo "$as_me: error: cannot run test program while cross compiling - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ } - else - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" -@@ -7982,7 +7946,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 - ( exit $ac_status ) - { { echo "$as_me:$LINENO: error: Can't run the compiler - internal error. Sorry." >&5 - echo "$as_me: error: Can't run the compiler - internal error. Sorry." >&2;} -- { (exit 1); exit 1; }; } -+ } - fi - rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi -@@ -8251,7 +8215,7 @@ done - if test ! -f "$as_myself"; then - { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 - echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} -- { (exit 1); exit 1; }; } -+ } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking IRIX sun library..." >&5 +@@ -7023,7 +7021,7 @@ as_fn_error () + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - case $CONFIG_SHELL in - '') -@@ -8302,7 +8266,7 @@ done - chmod +x $as_me.lineno || - { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 - echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} -- { (exit 1); exit 1; }; } -+ } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the -@@ -8494,7 +8458,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF - Try \`$0 --help' for more information." >&5 - echo "$as_me: error: ambiguous option: $1 - Try \`$0 --help' for more information." >&2;} -- { (exit 1); exit 1; }; };; -+ };; - --help | --hel | -h ) - echo "$ac_cs_usage"; exit 0 ;; - --debug | --d* | -d ) -@@ -8516,7 +8480,7 @@ Try \`$0 --help' for more information." - Try \`$0 --help' for more information." >&5 - echo "$as_me: error: unrecognized option: $1 - Try \`$0 --help' for more information." >&2;} -- { (exit 1); exit 1; }; } ;; -+ } ;; - - *) ac_config_targets="$ac_config_targets $1" ;; - -@@ -8555,7 +8519,7 @@ do - "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 - echo "$as_me: error: invalid argument: $ac_config_target" >&2;} -- { (exit 1); exit 1; }; };; -+ };; - esac - done - -@@ -8750,7 +8714,7 @@ echo X"$as_dir" | - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 - echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} -- { (exit 1); exit 1; }; }; } -+ }; } - - ac_builddir=. + $as_echo "$as_me: error: $2" >&2 +- as_fn_exit $as_status ++ # as_fn_exit $as_status + } # as_fn_error -@@ -8816,7 +8780,7 @@ echo "$as_me: creating $ac_file" >&6;} - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 - echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -+ } - echo $f;; - *) # Relative - if test -f "$f"; then -@@ -8829,7 +8793,7 @@ echo "$as_me: error: cannot find input f - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 - echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -+ } - fi;; - esac - done` || { (exit 1); exit 1; } -@@ -8907,7 +8871,7 @@ echo "$as_me: creating $ac_file" >&6;} - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 - echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -+ } - echo $f;; - *) # Relative - if test -f "$f"; then -@@ -8920,7 +8884,7 @@ echo "$as_me: error: cannot find input f - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 - echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -+ } - fi;; - esac - done` || { (exit 1); exit 1; } -@@ -9073,7 +9037,7 @@ echo X"$as_dir" | - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 - echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} -- { (exit 1); exit 1; }; }; } -+ }; } - rm -f $ac_file - mv $tmp/config.h $ac_file diff --git a/package/screen/patches/patch-process_c b/package/screen/patches/patch-process_c deleted file mode 100644 index d41cee752..000000000 --- a/package/screen/patches/patch-process_c +++ /dev/null @@ -1,15 +0,0 @@ ---- screen-4.0.3.orig/process.c 2003-09-18 14:53:54.000000000 +0200 -+++ screen-4.0.3/process.c 2014-02-19 08:27:28.000000000 +0100 -@@ -35,12 +35,6 @@ - - - #include "config.h" -- --/* for solaris 2.1, Unixware (SVR4.2) and possibly others: */ --#ifdef SVR4 --# include --#endif -- - #include "screen.h" - #include "extern.h" - #include "logfile.h" diff --git a/package/screen/patches/patch-pty_c b/package/screen/patches/patch-pty_c index e62923e01..90d5636b4 100644 --- a/package/screen/patches/patch-pty_c +++ b/package/screen/patches/patch-pty_c @@ -1,14 +1,15 @@ ---- screen-4.0.3.orig/pty.c 2003-09-08 16:26:18.000000000 +0200 -+++ screen-4.0.3/pty.c 2014-02-19 08:26:17.000000000 +0100 -@@ -33,11 +33,6 @@ - # include +--- screen-4.2.1.orig/pty.c 2014-04-26 12:58:35.000000000 +0200 ++++ screen-4.2.1/pty.c 2014-05-01 13:04:48.000000000 +0200 +@@ -39,9 +39,9 @@ #endif --/* for solaris 2.1, Unixware (SVR4.2) and possibly others */ --#ifdef HAVE_SVR4_PTYS + /* for solaris 2.1, Unixware (SVR4.2) and possibly others */ +-#ifdef HAVE_STROPTS_H -# include -#endif -- ++//#ifdef HAVE_STROPTS_H ++//# include ++//#endif + #if defined(sun) && defined(LOCKPTY) && !defined(TIOCEXCL) # include - #endif diff --git a/package/screen/patches/patch-sched_h b/package/screen/patches/patch-sched_h index 17e9cf010..56508f1cd 100644 --- a/package/screen/patches/patch-sched_h +++ b/package/screen/patches/patch-sched_h @@ -1,7 +1,7 @@ ---- screen-4.0.3.orig/sched.h 2002-01-08 16:42:43.000000000 +0100 -+++ screen-4.0.3/sched.h 2008-10-08 13:33:43.000000000 +0200 -@@ -22,6 +22,11 @@ - * $Id: sched.h,v 1.1.1.1 1993/06/16 23:51:13 jnweiger Exp $ FAU +--- screen-4.2.1.orig/sched.h 2014-04-26 12:58:35.000000000 +0200 ++++ screen-4.2.1/sched.h 2014-05-01 13:04:48.000000000 +0200 +@@ -27,6 +27,11 @@ + * $Id$ GNU */ +#ifndef __SCHED_H @@ -12,7 +12,7 @@ struct event { struct event *next; -@@ -41,3 +46,5 @@ struct event +@@ -46,3 +51,5 @@ struct event #define EV_READ 1 #define EV_WRITE 2 #define EV_ALWAYS 3 diff --git a/package/screen/patches/patch-screen_c b/package/screen/patches/patch-screen_c deleted file mode 100644 index 441dd6255..000000000 --- a/package/screen/patches/patch-screen_c +++ /dev/null @@ -1,13 +0,0 @@ ---- screen-4.0.3.orig/screen.c 2003-09-08 16:26:41.000000000 +0200 -+++ screen-4.0.3/screen.c 2014-02-19 08:27:10.000000000 +0100 -@@ -50,10 +50,6 @@ - - #include "config.h" - --#ifdef SVR4 --# include --#endif -- - #if defined(SYSV) && !defined(ISC) - # include - #endif diff --git a/package/screen/patches/patch-tty_sh b/package/screen/patches/patch-tty_sh deleted file mode 100644 index 218a3f9e8..000000000 --- a/package/screen/patches/patch-tty_sh +++ /dev/null @@ -1,13 +0,0 @@ ---- screen-4.0.3.orig/tty.sh 2003-09-08 16:24:25.000000000 +0200 -+++ screen-4.0.3/tty.sh 2014-02-19 08:40:44.000000000 +0100 -@@ -76,10 +76,6 @@ exit 0 - #endif - - #include "config.h" --#ifdef SVR4 --#include /* for I_POP */ --#endif -- - #include "screen.h" - #include "extern.h" - -- cgit v1.2.3