Skip to contentSkip to conversation

package/screen: bump version to 4.7.0

PATCH New Bernd Kuhls 2 participants 2 messages Oct 21, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/screen: bump version to 4.7.0

Release notes:
https://lists.gnu.org/archive/html/info-gnu/2019-10/msg00000.html

Removed patches applied upstream:

- 0001-compiler-sanity-checks.patch
https://git.savannah.gnu.org/cgit/screen.git/commit/?h=v.4.7.0&id=6b320186db7df1e58fdd2c836af54c86cc596981

- 0003-cross-compilation-AC_TRY_RUN.patch
https://git.savannah.gnu.org/cgit/screen.git/commit/?h=v.4.7.0&id=abba47ce4206506c49858d944e904fff86ae65cc

- 0004-cross-compilation-ignore-host-fs.patch
https://git.savannah.gnu.org/cgit/screen.git/commit/?h=v.4.7.0&id=c573b89139e7a068f5573abd565605bed60f293f

- 0005-avoid-identifying-as-SVR4.patch
https://git.savannah.gnu.org/cgit/screen.git/commit/?h=v.4.7.0&id=ec90292592dd2c9d5c108390841e3df24e377ed5

Rebased 0001-no-memcpy-fallback.patch

---
 .../screen/0001-compiler-sanity-checks.patch  |  62 --------
 ...ck.patch => 0001-no-memcpy-fallback.patch} |   4 +-
 ...ch => 0002-install-no-backup-binary.patch} |   0
 .../0003-cross-compilation-AC_TRY_RUN.patch   | 125 -----------------
 ....patch => 0003-install-always-chmod.patch} |   0
 ...004-cross-compilation-ignore-host-fs.patch | 132 ------------------
 ...=> 0004-install-nonversioned-binary.patch} |   0
 .../0005-avoid-identifying-as-SVR4.patch      |  54 -------
 ...ched_h.patch => 0005-rename-sched_h.patch} |   0
 ...> 0006-comm-h-now-depends-on-term-h.patch} |   0
 ...needed-for-list_-display-generic-.o.patch} |   0
 package/screen/screen.hash                    |   4 +-
 package/screen/screen.mk                      |   2 +-
 13 files changed, 6 insertions(+), 377 deletions(-)
 delete mode 100644 package/screen/0001-compiler-sanity-checks.patch
 rename package/screen/{0002-no-memcpy-fallback.patch => 0001-no-memcpy-fallback.patch} (96%)
 rename package/screen/{0006-install-no-backup-binary.patch => 0002-install-no-backup-binary.patch} (100%)
 delete mode 100644 package/screen/0003-cross-compilation-AC_TRY_RUN.patch
 rename package/screen/{0007-install-always-chmod.patch => 0003-install-always-chmod.patch} (100%)
 delete mode 100644 package/screen/0004-cross-compilation-ignore-host-fs.patch
 rename package/screen/{0008-install-nonversioned-binary.patch => 0004-install-nonversioned-binary.patch} (100%)
 delete mode 100644 package/screen/0005-avoid-identifying-as-SVR4.patch
 rename package/screen/{0009-rename-sched_h.patch => 0005-rename-sched_h.patch} (100%)
 rename package/screen/{0010-comm-h-now-depends-on-term-h.patch => 0006-comm-h-now-depends-on-term-h.patch} (100%)
 rename package/screen/{0011-comm.h-needed-for-list_-display-generic-.o.patch => 0007-comm.h-needed-for-list_-display-generic-.o.patch} (100%)
package/screen/0001-compiler-sanity-checks.patch deleted +0 -62
deleted file mode 100644
index fe6c3fdbc1..0000000000
@@ -1,62 +0,0 @@
-From: Maarten ter Huurne <[email protected]>
-Date: Sat, 13 Sep 2014 10:27:27 +0200
-Subject: Removed redundant compiler sanity checks
-
-AC_PROG_CC already performs sanity checks. And unlike the removed
-checks, it does so in a way that supports cross compilation.
-
-Signed-off-by: Maarten ter Huurne <[email protected]>
-[Ricardo: rebase on top of 4.3.1]
-Signed-off-by: Ricardo Martincoski <[email protected]>
----
- configure.ac | 27 ---------------------------
- 1 file changed, 27 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index ffe2e37..27690a6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -48,31 +48,6 @@ AC_PROG_GCC_TRADITIONAL
- AC_ISC_POSIX
- AC_USE_SYSTEM_EXTENSIONS
- 
--AC_TRY_RUN(main(){exit(0);},,[
--if test $CC != cc ; then
--AC_NOTE(Your $CC failed - restarting with CC=cc)
--AC_NOTE()
--CC=cc
--export CC
--exec $0 $configure_args
--fi
--])
--
--AC_TRY_RUN(main(){exit(0);},,
--exec 5>&2
--eval $ac_link
--AC_NOTE(CC=$CC; CFLAGS=$CFLAGS; LIBS=$LIBS;)
--AC_NOTE($ac_compile)
--AC_MSG_ERROR(Can't run the compiler - sorry))
--
--AC_TRY_RUN([
--main()
--{
--  int __something_strange_();
--  __something_strange_(0);
--}
--],AC_MSG_ERROR(Your compiler does not set the exit status - sorry))
--
- AC_PROG_AWK
- 
- AC_PROG_INSTALL
-@@ -1300,8 +1275,6 @@ fi
- dnl Ptx bug workaround -- insert -lc after -ltermcap
- test -n "$seqptx" && LIBS="-ltermcap -lc -lsocket -linet -lnsl -lsec -lseq"
- 
--AC_TRY_RUN(main(){exit(0);},,AC_MSG_ERROR(Can't run the compiler - internal error. Sorry.))
--
- ETCSCREENRC=
- AC_MSG_CHECKING(for the global screenrc file)
- AC_ARG_WITH(sys-screenrc, [  --with-sys-screenrc=path to the global screenrc file], [ ETCSCREENRC="${withval}" ])
--- 
-1.8.4.5
-
package/screen/0001-no-memcpy-fallback.patch renamed from package/screen/0002-no-memcpy-fallback.patch +3 -1
similarity index 96%
rename from package/screen/0002-no-memcpy-fallback.patch
rename to package/screen/0001-no-memcpy-fallback.patch
index f3a6a70d2a..2137907199 100644
@@ -14,6 +14,8 @@ option should not break any systems.
 Signed-off-by: Maarten ter Huurne <[email protected]>
 [Ricardo: rebase on top of 4.3.1]
 Signed-off-by: Ricardo Martincoski <[email protected]>
+[Bernd: rebase on top of 4.7.0]
+Signed-off-by: Bernd Kuhls <[email protected]>
 ---
  acconfig.h   |  3 +--
  configure.ac | 18 +-----------------
@@ -73,7 +75,7 @@ index 27690a6..b8e3bec 100644
 -  if (strncmp(buf, "cdedef", 6))
 -    exit(1);
 -  exit(0); /* libc version works properly.  */
--}], AC_DEFINE(USEMEMCPY))
+-}], AC_DEFINE(USEMEMCPY),,:)
 -
  AC_SYS_LONG_FILE_NAMES
  
package/screen/0002-install-no-backup-binary.patch renamed from package/screen/0006-install-no-backup-binary.patch +0 -0
similarity index 100%
rename from package/screen/0006-install-no-backup-binary.patch
rename to package/screen/0002-install-no-backup-binary.patch
package/screen/0003-cross-compilation-AC_TRY_RUN.patch deleted +0 -125

125 lines not on this page · raw message

package/screen/0003-install-always-chmod.patch renamed from package/screen/0007-install-always-chmod.patch +0 -0
similarity index 100%
rename from package/screen/0007-install-always-chmod.patch
rename to package/screen/0003-install-always-chmod.patch
package/screen/0004-cross-compilation-ignore-host-fs.patch deleted +0 -132

132 lines not on this page · raw message

package/screen/0004-install-nonversioned-binary.patch renamed from package/screen/0008-install-nonversioned-binary.patch +0 -0
similarity index 100%
rename from package/screen/0008-install-nonversioned-binary.patch
rename to package/screen/0004-install-nonversioned-binary.patch
package/screen/0005-avoid-identifying-as-SVR4.patch deleted +0 -54

54 lines not on this page · raw message

package/screen/0005-rename-sched_h.patch renamed from package/screen/0009-rename-sched_h.patch +0 -0
similarity index 100%
rename from package/screen/0009-rename-sched_h.patch
rename to package/screen/0005-rename-sched_h.patch
package/screen/0006-comm-h-now-depends-on-term-h.patch renamed from package/screen/0010-comm-h-now-depends-on-term-h.patch +0 -0
similarity index 100%
rename from package/screen/0010-comm-h-now-depends-on-term-h.patch
rename to package/screen/0006-comm-h-now-depends-on-term-h.patch
package/screen/0007-comm.h-needed-for-list_-display-generic-.o.patch renamed from package/screen/0011-comm.h-needed-for-list_-display-generic-.o.patch +0 -0
similarity index 100%
rename from package/screen/0011-comm.h-needed-for-list_-display-generic-.o.patch
rename to package/screen/0007-comm.h-needed-for-list_-display-generic-.o.patch
package/screen/screen.hash +2 -2
index 0e1613b28a..b09ac34700 100644
@@ -1,5 +1,5 @@
 # Locally calculated after checking pgp signature
-# https://ftp.gnu.org/gnu/screen/screen-4.6.2.tar.gz.sig
-sha256 1b6922520e6a0ce5e28768d620b0f640a6631397f95ccb043b70b91bb503fa3a  screen-4.6.2.tar.gz
+# https://ftp.gnu.org/gnu/screen/screen-4.7.0.tar.gz.sig
+sha256 da775328fa783bd2a787d722014dbd99c6093effc11f337827604c2efc5d20c1  screen-4.7.0.tar.gz
 # Locally calculated
 sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  COPYING
package/screen/screen.mk +1 -1
index 37d43366c2..91aa7c3a7a 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SCREEN_VERSION = 4.6.2
+SCREEN_VERSION = 4.7.0
 SCREEN_SITE = $(BR2_GNU_MIRROR)/screen
 SCREEN_LICENSE = GPL-3.0+
 SCREEN_LICENSE_FILES = COPYING
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 package/screen: bump version to 4.7.0

Quoted 38 lines · On Mon, 21 Oct 2019 19:51:40 +0200 Bernd Kuhls <[email protected]> wrote:

Release notes:
https://lists.gnu.org/archive/html/info-gnu/2019-10/msg00000.html

Removed patches applied upstream:

- 0001-compiler-sanity-checks.patch
https://git.savannah.gnu.org/cgit/screen.git/commit/?h=v.4.7.0&id=6b320186db7df1e58fdd2c836af54c86cc596981

- 0003-cross-compilation-AC_TRY_RUN.patch
https://git.savannah.gnu.org/cgit/screen.git/commit/?h=v.4.7.0&id=abba47ce4206506c49858d944e904fff86ae65cc

- 0004-cross-compilation-ignore-host-fs.patch
https://git.savannah.gnu.org/cgit/screen.git/commit/?h=v.4.7.0&id=c573b89139e7a068f5573abd565605bed60f293f

- 0005-avoid-identifying-as-SVR4.patch
https://git.savannah.gnu.org/cgit/screen.git/commit/?h=v.4.7.0&id=ec90292592dd2c9d5c108390841e3df24e377ed5

Rebased 0001-no-memcpy-fallback.patch

---
 .../screen/0001-compiler-sanity-checks.patch  |  62 --------
 ...ck.patch => 0001-no-memcpy-fallback.patch} |   4 +-
 ...ch => 0002-install-no-backup-binary.patch} |   0
 .../0003-cross-compilation-AC_TRY_RUN.patch   | 125 -----------------
 ....patch => 0003-install-always-chmod.patch} |   0
 ...004-cross-compilation-ignore-host-fs.patch | 132 ------------------
 ...=> 0004-install-nonversioned-binary.patch} |   0  
 .../0005-avoid-identifying-as-SVR4.patch      |  54 -------
 ...ched_h.patch => 0005-rename-sched_h.patch} |   0
 ...> 0006-comm-h-now-depends-on-term-h.patch} |   0  
 ...needed-for-list_-display-generic-.o.patch} |   0
 package/screen/screen.hash                    |   4 +-
 package/screen/screen.mk                      |   2 +-
 13 files changed, 6 insertions(+), 377 deletions(-)
 delete mode 100644 package/screen/0001-compiler-sanity-checks.patch
 rename package/screen/{0002-no-memcpy-fallback.patch => 0001-no-memcpy-fallback.patch} (96%)
 rename package/screen/{0006-install-no-backup-binary.patch => 0002-install-no-backup-binary.patch} (100%)
Quoted 8 lines
 delete mode 100644 package/screen/0003-cross-compilation-AC_TRY_RUN.patch
 rename package/screen/{0007-install-always-chmod.patch => 0003-install-always-chmod.patch} (100%)
 delete mode 100644 package/screen/0004-cross-compilation-ignore-host-fs.patch
 rename package/screen/{0008-install-nonversioned-binary.patch => 0004-install-nonversioned-binary.patch} (100%)
 delete mode 100644 package/screen/0005-avoid-identifying-as-SVR4.patch
 rename package/screen/{0009-rename-sched_h.patch => 0005-rename-sched_h.patch} (100%)
 rename package/screen/{0010-comm-h-now-depends-on-term-h.patch => 0006-comm-h-now-depends-on-term-h.patch} (100%)
 rename package/screen/{0011-comm.h-needed-for-list_-display-generic-.o.patch => 0007-comm.h-needed-for-list_-display-generic-.o.patch} (100%)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com