Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.github
.gitignore
README.md
18 changes: 9 additions & 9 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM bitnami/minideb:buster AS builder
FROM bitnami/minideb:trixie AS builder
ARG ref=master
WORKDIR /tmp/zsh-build
RUN install_packages curl \
Expand All @@ -7,9 +7,9 @@ RUN install_packages curl \
make \
libtool \
libcap-dev \
libtinfo5 \
libncursesw5-dev \
libpcre3-dev \
libtinfo6 \
libncurses-dev \
libpcre2-dev \
libgdbm-dev \
yodl \
groff \
Expand All @@ -18,7 +18,7 @@ RUN install_packages curl \
patch
RUN curl -L https://api.github.com/repos/zsh-users/zsh/tarball/$ref | tar xz --strip=1

COPY *.patch ./
COPY patches/* ./
RUN for p in *.patch; do patch -s -p1 -r /dev/null -i $p || true; done

RUN ./Util/preconfig
Expand All @@ -45,13 +45,13 @@ RUN yes '' | adduser --shell /bin/sh --home /tmp/zsh-build --disabled-login --di
RUN chown -R zshtest /tmp/zsh-build
RUN su - zshtest -c 'timeout 120 make test' || true

FROM bitnami/minideb:buster
FROM bitnami/minideb:trixie
LABEL maintainer="https://github.com/zsh-users/zsh-docker"
WORKDIR /
COPY --from=builder /tmp/zsh-install /
RUN install_packages libcap2 \
libtinfo5 \
libncursesw5 \
libpcre3 \
libtinfo6 \
libncursesw6 \
libpcre2-8-0 \
libgdbm6
CMD ["/usr/bin/zsh","-l"]
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
From: Florian Weimer <fweimer@redhat.com>
Date: Fri, 8 Dec 2023 21:58:07 +0100
Subject: 52383: Avoid incompatible pointer types in terminfo global variable
checks
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Origin: upstream, commit:https://sourceforge.net/p/zsh/code/ci/4c89849c98172c951a9def3690e8647dae76308f/
Bug-Debian: https://bugs.debian.org/1075708

Recreated for zsh 5.5.1 and older.

Co-authored-by: Marc Cornellà <marc@mcornella.com>
---
configure.ac | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/configure.ac b/configure.ac
index d15a6cda2..3a7e496c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1727,33 +1727,27 @@ if test x$zsh_cv_path_term_header != xnone; then
fi

AC_MSG_CHECKING(if boolcodes is available)
- AC_TRY_LINK($term_includes, [char **test = boolcodes; puts(*test);],
- AC_DEFINE(HAVE_BOOLCODES) boolcodes=yes, boolcodes=no)
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)boolcodes; puts(*test);]])],[AC_DEFINE(HAVE_BOOLCODES) boolcodes=yes],[boolcodes=no])
AC_MSG_RESULT($boolcodes)

AC_MSG_CHECKING(if numcodes is available)
- AC_TRY_LINK($term_includes, [char **test = numcodes; puts(*test);],
- AC_DEFINE(HAVE_NUMCODES) numcodes=yes, numcodes=no)
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)numcodes; puts(*test);]])],[AC_DEFINE(HAVE_NUMCODES) numcodes=yes],[numcodes=no])
AC_MSG_RESULT($numcodes)

AC_MSG_CHECKING(if strcodes is available)
- AC_TRY_LINK($term_includes, [char **test = strcodes; puts(*test);],
- AC_DEFINE(HAVE_STRCODES) strcodes=yes, strcodes=no)
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)strcodes; puts(*test);]])],[AC_DEFINE(HAVE_STRCODES) strcodes=yes],[strcodes=no])
AC_MSG_RESULT($strcodes)

AC_MSG_CHECKING(if boolnames is available)
- AC_TRY_LINK($term_includes, [char **test = boolnames; puts(*test);],
- AC_DEFINE(HAVE_BOOLNAMES) boolnames=yes, boolnames=no)
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)boolnames; puts(*test);]])],[AC_DEFINE(HAVE_BOOLNAMES) boolnames=yes],[boolnames=no])
AC_MSG_RESULT($boolnames)

AC_MSG_CHECKING(if numnames is available)
- AC_TRY_LINK($term_includes, [char **test = numnames; puts(*test);],
- AC_DEFINE(HAVE_NUMNAMES) numnames=yes, numnames=no)
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)numnames; puts(*test);]])],[AC_DEFINE(HAVE_NUMNAMES) numnames=yes],[numnames=no])
AC_MSG_RESULT($numnames)

AC_MSG_CHECKING(if strnames is available)
- AC_TRY_LINK($term_includes, [char **test = strnames; puts(*test);],
- AC_DEFINE(HAVE_STRNAMES) strnames=yes, strnames=no)
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)strnames; puts(*test);]])],[AC_DEFINE(HAVE_STRNAMES) strnames=yes],[strnames=no])
AC_MSG_RESULT($strnames)

dnl There are apparently defective terminal library headers on some
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
From: Florian Weimer <fweimer@redhat.com>
Date: Fri, 8 Dec 2023 21:58:07 +0100
Subject: 52383: Avoid incompatible pointer types in terminfo global variable
checks

Origin: upstream, commit:https://sourceforge.net/p/zsh/code/ci/4c89849c98172c951a9def3690e8647dae76308f/
Bug-Debian: https://bugs.debian.org/1075708
---
configure.ac | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index f810052..928b467 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1771,27 +1771,27 @@ if test x$zsh_cv_path_term_header != xnone; then
fi

AC_MSG_CHECKING(if boolcodes is available)
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = boolcodes; puts(*test);]])],[AC_DEFINE(HAVE_BOOLCODES) boolcodes=yes],[boolcodes=no])
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)boolcodes; puts(*test);]])],[AC_DEFINE(HAVE_BOOLCODES) boolcodes=yes],[boolcodes=no])
AC_MSG_RESULT($boolcodes)

AC_MSG_CHECKING(if numcodes is available)
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = numcodes; puts(*test);]])],[AC_DEFINE(HAVE_NUMCODES) numcodes=yes],[numcodes=no])
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)numcodes; puts(*test);]])],[AC_DEFINE(HAVE_NUMCODES) numcodes=yes],[numcodes=no])
AC_MSG_RESULT($numcodes)

AC_MSG_CHECKING(if strcodes is available)
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = strcodes; puts(*test);]])],[AC_DEFINE(HAVE_STRCODES) strcodes=yes],[strcodes=no])
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)strcodes; puts(*test);]])],[AC_DEFINE(HAVE_STRCODES) strcodes=yes],[strcodes=no])
AC_MSG_RESULT($strcodes)

AC_MSG_CHECKING(if boolnames is available)
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = boolnames; puts(*test);]])],[AC_DEFINE(HAVE_BOOLNAMES) boolnames=yes],[boolnames=no])
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)boolnames; puts(*test);]])],[AC_DEFINE(HAVE_BOOLNAMES) boolnames=yes],[boolnames=no])
AC_MSG_RESULT($boolnames)

AC_MSG_CHECKING(if numnames is available)
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = numnames; puts(*test);]])],[AC_DEFINE(HAVE_NUMNAMES) numnames=yes],[numnames=no])
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)numnames; puts(*test);]])],[AC_DEFINE(HAVE_NUMNAMES) numnames=yes],[numnames=no])
AC_MSG_RESULT($numnames)

AC_MSG_CHECKING(if strnames is available)
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = strnames; puts(*test);]])],[AC_DEFINE(HAVE_STRNAMES) strnames=yes],[strnames=no])
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)strnames; puts(*test);]])],[AC_DEFINE(HAVE_STRNAMES) strnames=yes],[strnames=no])
AC_MSG_RESULT($strnames)

dnl There are apparently defective terminal library headers on some