mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Michael Olbrich <m.olbrich@pengutronix.de>
To: Christian Melki <christian.melki@t2data.com>
Cc: ptxdist@pengutronix.de
Subject: Re: [ptxdist] [PATCH] screen: Version bump. 4.9.1 -> 5.0.0
Date: Tue, 10 Sep 2024 12:58:02 +0200	[thread overview]
Message-ID: <ZuAmOpCPzmGCosBd@pengutronix.de> (raw)
In-Reply-To: <20240901173314.3227871-1-christian.melki@t2data.com>

On Sun, Sep 01, 2024 at 07:33:14PM +0200, Christian Melki wrote:
> A few interesting changes.
> https://lists.gnu.org/archive/html/info-gnu/2024-08/msg00004.html
> 
> * License hash changed. Spelling error fixed.
> 
> * Patchset modified. Dropped a few, fixed the remaining one.
> 
> * Change options. Make PAM enabled on a ptxdist global.

That part fails to build:

checking for PAM support... configure: error: no


I expect that you need to select PAM in that case.

Michael

> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> ---
>  .../0001-comm.h-now-depends-on-term.h.patch   | 24 --------------
>  ...-needed-for-list_-display-generic-.o.patch | 31 -------------------
>  patches/screen-4.9.1/series                   |  6 ----
>  .../0001-suppress_remap.patch}                | 20 ++++++------
>  .../{screen-4.9.1 => screen-5.0.0}/autogen.sh |  0
>  patches/screen-5.0.0/series                   |  4 +++
>  rules/screen.make                             | 12 ++++---
>  7 files changed, 21 insertions(+), 76 deletions(-)
>  delete mode 100644 patches/screen-4.9.1/0001-comm.h-now-depends-on-term.h.patch
>  delete mode 100644 patches/screen-4.9.1/0002-comm.h-needed-for-list_-display-generic-.o.patch
>  delete mode 100644 patches/screen-4.9.1/series
>  rename patches/{screen-4.9.1/0003-suppress_remap.patch => screen-5.0.0/0001-suppress_remap.patch} (62%)
>  rename patches/{screen-4.9.1 => screen-5.0.0}/autogen.sh (100%)
>  create mode 100644 patches/screen-5.0.0/series
> 
> diff --git a/patches/screen-4.9.1/0001-comm.h-now-depends-on-term.h.patch b/patches/screen-4.9.1/0001-comm.h-now-depends-on-term.h.patch
> deleted file mode 100644
> index 6b364c26d..000000000
> --- a/patches/screen-4.9.1/0001-comm.h-now-depends-on-term.h.patch
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -From: Mike Gerwitz <mike@mikegerwitz.com>
> -Date: Tue, 24 Dec 2013 22:16:31 -0500
> -Subject: [PATCH] comm.h now depends on term.h
> -
> -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> -[Patch retrieved and updated from:
> -http://git.savannah.gnu.org/cgit/screen.git/commit/?id=39c5f1c]
> ----
> - Makefile.in | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/Makefile.in b/Makefile.in
> -index 26ec40450bdb..4bc364671904 100644
> ---- a/Makefile.in
> -+++ b/Makefile.in
> -@@ -133,7 +133,7 @@ kmapdef.c: term.h
> - tty.c:	tty.sh 
> - 	sh $(srcdir)/tty.sh tty.c
> - 
> --comm.h: comm.c comm.sh config.h
> -+comm.h: comm.c comm.sh config.h term.h
> - 	AWK=$(AWK) CC="$(CC) $(CFLAGS)" srcdir=${srcdir} sh $(srcdir)/comm.sh
> - 
> - osdef.h: osdef.sh config.h osdef.h.in
> diff --git a/patches/screen-4.9.1/0002-comm.h-needed-for-list_-display-generic-.o.patch b/patches/screen-4.9.1/0002-comm.h-needed-for-list_-display-generic-.o.patch
> deleted file mode 100644
> index f51639ef1..000000000
> --- a/patches/screen-4.9.1/0002-comm.h-needed-for-list_-display-generic-.o.patch
> +++ /dev/null
> @@ -1,31 +0,0 @@
> -From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> -Date: Wed, 3 Oct 2018 22:29:32 +0200
> -Subject: [PATCH] comm.h needed for list_{display,generic}.o
> -
> -comm.h is needed to build list_display.o and list_generic.o otherwise
> -parallel builds will sometimes fail
> -
> -Fixes:
> - - http://autobuild.buildroot.org/results/43105f14857dbe72d8878fc7b3db67f7bdca93cc
> - - http://autobuild.buildroot.org/results/47f4ecbec1355285633df287fc9c4e7cccde9378
> -
> -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> -[Upstream status: https://savannah.gnu.org/bugs/index.php?54776]
> ----
> - Makefile.in | 4 ++--
> - 1 file changed, 2 insertions(+), 2 deletions(-)
> -
> -diff --git a/Makefile.in b/Makefile.in
> -index 4bc364671904..8bfcac6f8412 100644
> ---- a/Makefile.in
> -+++ b/Makefile.in
> -@@ -350,7 +350,7 @@ layout.o: layout.h viewport.h canvas.h layout.c config.h screen.h os.h osdef.h a
> - viewport.o: layout.h viewport.h canvas.h viewport.c config.h screen.h os.h osdef.h ansi.h acls.h \
> -  comm.h layer.h term.h image.h display.h window.h extern.h \
> -  braille.h
> --list_generic.o: list_generic.h list_generic.c layer.h screen.h osdef.h
> --list_display.o: list_generic.h list_display.c layer.h screen.h osdef.h
> -+list_generic.o: list_generic.h list_generic.c layer.h screen.h osdef.h comm.h
> -+list_display.o: list_generic.h list_display.c layer.h screen.h osdef.h comm.h
> - list_window.o: list_generic.h list_window.c window.h layer.h screen.h osdef.h comm.h
> - 
> diff --git a/patches/screen-4.9.1/series b/patches/screen-4.9.1/series
> deleted file mode 100644
> index bf7060df3..000000000
> --- a/patches/screen-4.9.1/series
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-comm.h-now-depends-on-term.h.patch
> -0002-comm.h-needed-for-list_-display-generic-.o.patch
> -0003-suppress_remap.patch
> -# 086ac9b43abed5bb61eef564f1ac00d9  - git-ptx-patches magic
> diff --git a/patches/screen-4.9.1/0003-suppress_remap.patch b/patches/screen-5.0.0/0001-suppress_remap.patch
> similarity index 62%
> rename from patches/screen-4.9.1/0003-suppress_remap.patch
> rename to patches/screen-5.0.0/0001-suppress_remap.patch
> index fda63e90c..5ee358601 100644
> --- a/patches/screen-4.9.1/0003-suppress_remap.patch
> +++ b/patches/screen-5.0.0/0001-suppress_remap.patch
> @@ -10,15 +10,15 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>   1 file changed, 2 deletions(-)
>  
>  diff --git a/termcap.c b/termcap.c
> -index 26c8f5a96589..29684cf974f7 100644
> +index b49818b1a7ba..12b8b895c041 100644
>  --- a/termcap.c
>  +++ b/termcap.c
> -@@ -553,8 +553,6 @@ int map;
> -       else
> - 	break;
> -     }
> --  if (n < KMAP_KEYS)
> --    domap = 1;
> -   if (map == 0 && domap)
> -     return 0;
> -   if (map && !domap)
> +@@ -449,8 +449,6 @@ int remap(int n, int map)
> + 		} else
> + 			break;
> + 	}
> +-	if (n < KMAP_KEYS)
> +-		domap = 1;
> + 	if (map == 0 && domap)
> + 		return 0;
> + 	if (map && !domap)
> diff --git a/patches/screen-4.9.1/autogen.sh b/patches/screen-5.0.0/autogen.sh
> similarity index 100%
> rename from patches/screen-4.9.1/autogen.sh
> rename to patches/screen-5.0.0/autogen.sh
> diff --git a/patches/screen-5.0.0/series b/patches/screen-5.0.0/series
> new file mode 100644
> index 000000000..7033c2f63
> --- /dev/null
> +++ b/patches/screen-5.0.0/series
> @@ -0,0 +1,4 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-suppress_remap.patch
> +# 86664321851b5c0424c28324da82baff  - git-ptx-patches magic
> diff --git a/rules/screen.make b/rules/screen.make
> index 766bf79d3..1bac9b8b8 100644
> --- a/rules/screen.make
> +++ b/rules/screen.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SCREEN) += screen
>  #
>  # Paths and names
>  #
> -SCREEN_VERSION		:= 4.9.1
> -SCREEN_MD5		:= 9a9bdc956bd93e4f0cb9e48678889e26
> +SCREEN_VERSION		:= 5.0.0
> +SCREEN_MD5		:= befc115989242ed4bceeff8d8bfeb4e6
>  SCREEN			:= screen-$(SCREEN_VERSION)
>  SCREEN_SUFFIX		:= tar.gz
>  SCREEN_URL		:= $(call ptx/mirror, GNU, screen/$(SCREEN).$(SCREEN_SUFFIX))
> @@ -23,7 +23,7 @@ SCREEN_SOURCE		:= $(SRCDIR)/$(SCREEN).$(SCREEN_SUFFIX)
>  SCREEN_DIR		:= $(BUILDDIR)/$(SCREEN)
>  SCREEN_LICENSE		:= GPL-2.0-or-later
>  SCREEN_LICENSE_FILES	:= \
> -	file://COPYING;md5=d32239bcb673463ab874e80d47fae504
> +	file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e
>  
>  # ----------------------------------------------------------------------------
>  # Prepare
> @@ -35,8 +35,10 @@ SCREEN_LICENSE_FILES	:= \
>  SCREEN_CONF_TOOL := autoconf
>  SCREEN_CONF_OPT := \
>  	$(CROSS_AUTOCONF_USR) \
> -	--disable-use-locale \
> -	--with-sys-screenrc=/etc/screenrc
> +	--$(call ptx/endis, PTXCONF_GLOBAL_PAM)-pam \
> +	--enable-utmp \
> +	--disable-telnet \
> +	--with-system_screenrc=/etc/screenrc
>  
>  # ----------------------------------------------------------------------------
>  # Target-Install
> -- 
> 2.34.1
> 
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |



      reply	other threads:[~2024-09-10 10:58 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-01 17:33 Christian Melki
2024-09-10 10:58 ` Michael Olbrich [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=ZuAmOpCPzmGCosBd@pengutronix.de \
    --to=m.olbrich@pengutronix.de \
    --cc=christian.melki@t2data.com \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox