From d7d466673c76ca98dc2a7f9f4acbbc14e5cb4a84 Mon Sep 17 00:00:00 2001 From: "Andreas V. 'netrunner' Meier" Date: Tue, 9 Dec 2003 21:01:25 +0000 Subject: [PATCH] Andreas V. Meier and Rene Rebe: updated screen (4.0.2) (changeset includes .patch copyright updates ...) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1935 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- Documentation/Developers/CHANGELOG-RENE | 4 + package/base/screen/configure_pam.patch | 167 ---------------------- package/base/screen/correct_va_list.patch | 15 +- package/base/screen/glibc23.patch | 15 +- package/base/screen/make_j.patch | 15 +- package/base/screen/no_terminfo.patch | 15 +- package/base/screen/screen.desc | 4 +- package/base/screen/windowheight.patch | 19 +++ 8 files changed, 49 insertions(+), 205 deletions(-) delete mode 100644 package/base/screen/configure_pam.patch diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE index 1cd41ad21..ef4db0876 100644 --- a/Documentation/Developers/CHANGELOG-RENE +++ b/Documentation/Developers/CHANGELOG-RENE @@ -1,4 +1,8 @@ +*) 2003-12-09 (2.0.0-rc3 - 2.0.0-rc4) + + - Andreas V. Meier and Rene Rebe: updated screen (4.0.2) + *) 2003-12-08 (2.0.0-rc3 - 2.0.0-rc4) - Juergen Sawinski and Rene Rebe: udated linux24* (2.4.23) diff --git a/package/base/screen/configure_pam.patch b/package/base/screen/configure_pam.patch deleted file mode 100644 index 5ec021dae..000000000 --- a/package/base/screen/configure_pam.patch +++ /dev/null @@ -1,167 +0,0 @@ - -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/base/screen/configure_pam.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -Not only is libpam_misc needed, it is also needed earlier to not let -all the other tests fail when other libs have dependencies to libpam -or libpam_misc ... - -(Especially important to not let the vsprintf test fail and so the -VA_* macros are not used!) - - - Clifford Wold and Rene Rebe - ---- ./configure.orig 2003-02-24 14:03:33.000000000 +0100 -+++ ./configure 2003-08-26 01:47:59.000000000 +0200 -@@ -6624,6 +6624,66 @@ - fi - rm -f /tmp/conftest* - -+ -+# Check whether --enable-pam or --disable-pam was given. -+if test "${enable_pam+set}" = set; then -+ enableval="$enable_pam" -+ -+fi; -+if test "$enable_pam" = "yes"; then -+ echo "$as_me:$LINENO: checking for PAM support" >&5 -+echo $ECHO_N "checking for PAM support... $ECHO_C" >&6 -+ oldlibs="$LIBS" -+ LIBS="$LIBS -lpam -lpam_misc" -+ cat >conftest.$ac_ext <<_ACEOF -+#line $LINENO "configure" -+#include "confdefs.h" -+#include -+#ifdef F77_DUMMY_MAIN -+# ifdef __cplusplus -+ extern "C" -+# endif -+ int F77_DUMMY_MAIN() { return 1; } -+#endif -+int -+main () -+{ -+ -+ pam_start(0, 0, 0, 0); -+ pam_authenticate(0, 0); -+ pam_end(0,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 -+ echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6;cat >>confdefs.h <<\_ACEOF -+#define USE_PAM 1 -+_ACEOF -+ -+else -+ echo "$as_me: failed program was:" >&5 -+cat conftest.$ac_ext >&5 -+echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6;LIBS="$oldlibs" -+fi -+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+fi -+ -+ - echo "$as_me:$LINENO: checking for vsprintf" >&5 - echo $ECHO_N "checking for vsprintf... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF -@@ -7287,65 +7347,6 @@ - fi - done - -- --# Check whether --enable-pam or --disable-pam was given. --if test "${enable_pam+set}" = set; then -- enableval="$enable_pam" -- --fi; --if test "$enable_pam" = "yes"; then -- echo "$as_me:$LINENO: checking for PAM support" >&5 --echo $ECHO_N "checking for PAM support... $ECHO_C" >&6 -- oldlibs="$LIBS" -- LIBS="$LIBS -lpam" -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" --#include --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif --int --main () --{ -- -- pam_start(0, 0, 0, 0); -- pam_authenticate(0, 0); -- pam_end(0,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 -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6;cat >>confdefs.h <<\_ACEOF --#define USE_PAM 1 --_ACEOF -- --else -- echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6;LIBS="$oldlibs" --fi --rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --fi -- - # Check whether --enable-use_locale or --disable-use_locale was given. - if test "${enable_use_locale+set}" = set; then - enableval="$enable_use_locale" diff --git a/package/base/screen/correct_va_list.patch b/package/base/screen/correct_va_list.patch index 96c1f5f02..a20ef6b23 100644 --- a/package/base/screen/correct_va_list.patch +++ b/package/base/screen/correct_va_list.patch @@ -8,15 +8,12 @@ # ROCK Linux: rock-src/package/base/screen/correct_va_list.patch # ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. # # --- ROCK-COPYRIGHT-NOTE-END --- diff --git a/package/base/screen/glibc23.patch b/package/base/screen/glibc23.patch index e39d60dd6..1d854659f 100644 --- a/package/base/screen/glibc23.patch +++ b/package/base/screen/glibc23.patch @@ -8,15 +8,12 @@ # ROCK Linux: rock-src/package/base/screen/glibc23.patch # ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. # # --- ROCK-COPYRIGHT-NOTE-END --- diff --git a/package/base/screen/make_j.patch b/package/base/screen/make_j.patch index 2b08d8f26..f2b68d13e 100644 --- a/package/base/screen/make_j.patch +++ b/package/base/screen/make_j.patch @@ -8,15 +8,12 @@ # ROCK Linux: rock-src/package/base/screen/make_j.patch # ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. # # --- ROCK-COPYRIGHT-NOTE-END --- diff --git a/package/base/screen/no_terminfo.patch b/package/base/screen/no_terminfo.patch index d216c32ee..e6269fc89 100644 --- a/package/base/screen/no_terminfo.patch +++ b/package/base/screen/no_terminfo.patch @@ -8,15 +8,12 @@ # ROCK Linux: rock-src/package/base/screen/no_terminfo.patch # ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. # # --- ROCK-COPYRIGHT-NOTE-END --- diff --git a/package/base/screen/screen.desc b/package/base/screen/screen.desc index 8bdc92d6c..4a3bde08e 100644 --- a/package/base/screen/screen.desc +++ b/package/base/screen/screen.desc @@ -40,8 +40,8 @@ [L] GPL [S] Stable -[V] 3.9.15 +[V] 4.0.2 [P] X -----5---9 210.000 -[D] 1169505474 screen-3.9.15.tar.gz ftp://ftp.uni-erlangen.de/pub/utilities/screen/ +[D] 4251671639 screen-4.0.2.tar.gz ftp://ftp.uni-erlangen.de/pub/utilities/screen/ diff --git a/package/base/screen/windowheight.patch b/package/base/screen/windowheight.patch index 8c2bf9dd9..ebd6d1923 100644 --- a/package/base/screen/windowheight.patch +++ b/package/base/screen/windowheight.patch @@ -1,3 +1,22 @@ +# --- ROCK-COPYRIGHT-NOTE-BEGIN --- +# +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# Please add additional copyright information _after_ the line containing +# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +# +# ROCK Linux: rock-src/package/base/screen/windowheight.patch +# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# --- ROCK-COPYRIGHT-NOTE-END --- + diff -Nur screen-3.9.15.orig/ansi.c screen-3.9.15/ansi.c --- screen-3.9.15.orig/ansi.c 2003-03-13 12:14:53.000000000 +0100 +++ screen-3.9.15/ansi.c 2003-11-28 18:42:24.000000000 +0100