Update autoconf patches for version 4.5.0.
Add patches from debian stretch.
Skip cosmetic patch Replace-the-composed-characters-with-their-respectiv.patch.
Signed-off-by: Denis Osterland
---
.../0003-Fix-screenencodings-dir.patch | 27
patches/screen-4.0.3/series| 6 -
.../0001-don-t-link-against-libelf.patch | 24 ++--
.../0002-remove-configure-AC_TRY_RUN-tests.patch | 132 +--
.../0003-autoconf-cleanup.patch} | 145 +
.../0004-Fix-some-typos-found-by-Lintian.patch | 48 +++
.../0005-show-encoding-in-hardstatus.patch | 52
.../0006-Unbreak-several-useful-keybindings.patch | 22
...ge-escalation-by-reverting-upstream-commi.patch | 30 +
...l-garbage-in-Debian-Installer-over-serial.patch | 24
...ogfile-s-name-that-begins-with-the-symbol.patch | 77 +++
patches/{screen-4.0.3 => screen-4.5.0}/autogen.sh | 0
patches/screen-4.5.0/series| 12 ++
rules/screen.make | 5 +-
14 files changed, 408 insertions(+), 196 deletions(-)
delete mode 100644 patches/screen-4.0.3/0003-Fix-screenencodings-dir.patch
delete mode 100644 patches/screen-4.0.3/series
rename patches/{screen-4.0.3 =>
screen-4.5.0}/0001-don-t-link-against-libelf.patch (61%)
rename patches/{screen-4.0.3 =>
screen-4.5.0}/0002-remove-configure-AC_TRY_RUN-tests.patch (88%)
rename patches/{screen-4.0.3/0004-autoconf-cleanup.patch =>
screen-4.5.0/0003-autoconf-cleanup.patch} (74%)
create mode 100644
patches/screen-4.5.0/0004-Fix-some-typos-found-by-Lintian.patch
create mode 100644 patches/screen-4.5.0/0005-show-encoding-in-hardstatus.patch
create mode 100644
patches/screen-4.5.0/0006-Unbreak-several-useful-keybindings.patch
create mode 100644
patches/screen-4.5.0/0007-Fix-privilege-escalation-by-reverting-upstream-commi.patch
create mode 100644
patches/screen-4.5.0/0008-Fix-terminal-garbage-in-Debian-Installer-over-serial.patch
create mode 100644
patches/screen-4.5.0/0009-Ignore-logfile-s-name-that-begins-with-the-symbol.patch
rename patches/{screen-4.0.3 => screen-4.5.0}/autogen.sh (100%)
create mode 100644 patches/screen-4.5.0/series
diff --git a/patches/screen-4.0.3/0003-Fix-screenencodings-dir.patch
b/patches/screen-4.0.3/0003-Fix-screenencodings-dir.patch
deleted file mode 100644
index 18ae4ff..000
--- a/patches/screen-4.0.3/0003-Fix-screenencodings-dir.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Marc Kleine-Budde
-Date: Sun, 27 Mar 2011 15:18:27 +0200
-Subject: [PATCH] Fix screenencodings dir
-
-This patch fixes the assignement of the SCREENENCODINGS variable which was
holding "${}" before.
-
-Signed-off-by: Marc Kleine-Budde
- configure.in |2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 419279d..5411add 100644
a/configure.in
-+++ b/configure.in
-@@ -637,7 +637,7 @@ AC_MSG_RESULT($ETCSCREENRC)
- SCREENENCODINGS="\"/usr/local/lib/screen/utf8encodings\""
- if test -n "$datadir"; then
- eval SCREENENCODINGS="$datadir/screen/utf8encodings"
--SCREENENCODINGS="\"$SCREENENCODINGS\""
-+eval SCREENENCODINGS="\\\"$SCREENENCODINGS\\\""
- fi
- AC_MSG_CHECKING(for the utf8-encodings location)
- AC_DEFINE_UNQUOTED(SCREENENCODINGS,$SCREENENCODINGS)
---
-1.7.4.1
-
diff --git a/patches/screen-4.0.3/series b/patches/screen-4.0.3/series
deleted file mode 100644
index 92c8f7c..000
--- a/patches/screen-4.0.3/series
+++ /dev/null
@@ -1,6 +0,0 @@
-# generated by git-ptx-patches
-0001-don-t-link-against-libelf.patch
-0002-remove-configure-AC_TRY_RUN-tests.patch
-0003-Fix-screenencodings-dir.patch
-0004-autoconf-cleanup.patch
-# 281c2731ef1fdac0a3c30983673cb6c8 - git-ptx-patches magic
diff --git a/patches/screen-4.0.3/0001-don-t-link-against-libelf.patch
b/patches/screen-4.5.0/0001-don-t-link-against-libelf.patch
similarity index 61%
rename from patches/screen-4.0.3/0001-don-t-link-against-libelf.patch
rename to patches/screen-4.5.0/0001-don-t-link-against-libelf.patch
index 84ab86e..3ca4310 100644
--- a/patches/screen-4.0.3/0001-don-t-link-against-libelf.patch
+++ b/patches/screen-4.5.0/0001-don-t-link-against-libelf.patch
@@ -6,15 +6,17 @@ libelf is not used. It's just some broken configure check.
Patch from gentoo.
Signed-off-by: Michael Olbrich
+[osterlad: Update locations for version 4.5.0]
+Signed-off-by: Denis Osterland
---
- configure.in |9 -
- 1 files changed, 0 insertions(+), 9 deletions(-)
+ configure.ac | 8
+ 1 file changed, 8 deletions(-)
-diff --git a/configure.in b/configure.in
-index 34c9372..c1460af 100644
a/configure.in
-+++ b/configure.in
-@@ -195,15 +195,6 @@ AC_EGREP_CPP(yes,
+diff --git a/configure.ac b/configure.ac
+index ffe2e372426c..d88af75af665 100644
+---