Added support for Fedora 35, 36

rnpgp · Sep 16, 2023 · f603baa · f603baa
1 parent e109cc9
commit f603baa
Show file tree

Hide file tree

Showing 8 changed files with 91 additions and 78 deletions.
diff --git a/.github/workflows/build-containers.yml b/.github/workflows/build-containers.yml
@@ -25,6 +25,8 @@ jobs:
           - 'centos-7-amd64'
           - 'centos-8-amd64'
           - 'centos-9-amd64'
+          - 'fedora-3.5-amd64'
+          - 'fedora-3.6-amd64'
           - 'debian-11-amd64'
           - 'debian-11-i386'
           - 'debian-10-i386'

diff --git a/README.adoc b/README.adoc
@@ -43,75 +43,56 @@ However, under two circumstances custom requirements need to be supported:
 This repository created images that support two cases listed above
 
 
-[cols="a,a,a,a,a,a,a,a,a"]
+[cols="a,a,a,a,a"]
 |===
-| image                 | json-c version    | json-c source  | botan version  | botan source | botan install folder | gpg version | gpg source  | gpg`install folder
+| image                 | botan version  | botan source | gpg version | gpg source
 
 | debian-10-i386
-| 0.12.1
-| system-shipped
 | 2.18.2
-| local build
-| /usr/local
+| local build @ /usr/local
 | 2.2.12
-| system shipped | /usr
+| system shipped
 
 | debian-11-i386/amd64
-| 0.12.1
-| system-shipped
 | 2.18.2
-| local build
-| /usr/local
+| local build @ /usr/local
 | 2.2.27
 | system shipped
-| /usr
-
-.2+| centos-7-amd64
-.2+| json-c12 (0.12.1)
-.2+| ribose repo
-.2+| 2.16.0
-.2+| ribose repo
-.2+| /usr
+
+| centos-7-amd64
+| 2.16.0
+| ribose repo
 | 2.0.22
 | system shipped
-| /usr
-
-| stable (2.4.0)
-| local build
-| /opt/gpg/stable
-
-.4+| centos-8-amd64
-.4+| 0.13.1
-.4+| system-shipped
-.4+| 2.16.0
-.4+| ribose repo
-.4+| /usr
+
+| centos-8-amd64
+| 2.16.0
+| ribose repo
 | 2.2.20
 | system shipped
-| /usr
-
-| stable (2.4.0)
-| local build
-| /opt/gpg/stable
 
-| lts (2.2.41)
-| local build
-| /opt/gpg/lts
-
-| 2.3.1
-| local build
-| /opt/gpg/2.3.1
-
-.2+| centos-9-amd64
-.2+| 0.14
-.2+| system shipped
-.2+| 2.19.3
-.2+| system shipped
-.2+| /usr
+| centos-9-amd64
+| 2.19.3
+| system shipped
 | 2.3.3
 | system shipped
-| /usr
 
-| stable (2.4.0)
-| local build
-| /opt/gpg/stable
+| fedora-35-amd64
+| 2.18.2
+| system shipped
+| 2.3.4
+| system shipped
+
++3.| fedora-36-amd64
++2.| 2.19.1
++2.| system shipped
+| 2.3.7
+| system shipped
+
+| 3.1.1
+| local build @ /opt/botan/3.1.1
+| stable (2.4.3)
+| local build @ /opt/gpg/stable
+
+| lts (2.2.41)
+| local build @ /opt/gpg/lts
diff --git a/centos-7-amd64.Dockerfile b/centos-7-amd64.Dockerfile
@@ -22,9 +22,8 @@ RUN yum -y install http://opensource.wandisco.com/centos/7/git/x86_64/wandisco-g
     yum -y update                                                                                           && \
     yum -y install llvm-toolset-7.0 json-c12-devel clang gcc gcc-c++ make autoconf libtool gzip                \
                    bzip2 bzip2-devel gettext-devel ncurses-devel zlib-devel python3 asciidoctor                \
-                   botan2 botan2-devel openssl-devel bison byacc
+                   botan2 botan2-devel openssl-devel bison byacc gpg
 
 RUN /opt/tools/tools.sh ensure_symlink_to_target '/usr/bin/python3' '/usr/bin/python'               && \
     /opt/tools/tools.sh install_cmake                                                               && \
-    /opt/tools/tools.sh build_and_install_automake                                                  && \
-    /opt/tools/tools.sh build_and_install_gpg stable
+    /opt/tools/tools.sh build_and_install_automake
diff --git a/centos-8-amd64.Dockerfile b/centos-8-amd64.Dockerfile
@@ -19,12 +19,8 @@ RUN dnf -y update && dnf -y install sudo wget git epel-release 'dnf-command(conf
     wget https://github.com/riboseinc/yum/raw/master/ribose.repo -O /etc/yum.repos.d/ribose.repo     && \
     dnf -y install json-c-devel clang gcc gcc-c++ make autoconf libtool gzip bzip2 bzip2-devel          \
                    gettext-devel ncurses-devel zlib-devel python3 asciidoctor botan2 botan2-devel       \
-                   openssl-devel bison byacc cmake
+                   openssl-devel bison byacc cmake gpg
 
 RUN /opt/tools/tools.sh ensure_symlink_to_target '/usr/bin/python3' '/usr/bin/python' && \
     /opt/tools/tools.sh build_and_install_automake                                    && \
     /opt/tools/tools.sh build_and_install_libiconv
-
-RUN /opt/tools/tools.sh build_and_install_gpg stable && \
-    /opt/tools/tools.sh build_and_install_gpg lts    && \
-    /opt/tools/tools.sh build_and_install_gpg 2.3.1
diff --git a/centos-9-amd64.Dockerfile b/centos-9-amd64.Dockerfile
@@ -16,14 +16,8 @@ RUN dnf -y update && dnf -y install sudo wget git epel-release 'dnf-command(conf
     dnf config-manager --set-enabled crb                                                           && \
     dnf -y install json-c-devel clang gcc gcc-c++ make autoconf libtool gzip bzip2 bzip2-devel        \
                    gettext-devel ncurses-devel zlib-devel python3 asciidoctor botan2 botan2-devel     \
-                   openssl-devel bison byacc cmake
-
+                   openssl-devel bison byacc cmake gpg
 
 RUN /opt/tools/tools.sh ensure_symlink_to_target '/usr/bin/python3' '/usr/bin/python'  && \
     /opt/tools/tools.sh build_and_install_automake                                     && \
     /opt/tools/tools.sh build_and_install_libiconv
-
-RUN /opt/tools/tools.sh build_and_install_gpg stable
-
-#
-#
diff --git a/fedora-35-amd64.Dockerfile b/fedora-35-amd64.Dockerfile
@@ -0,0 +1,20 @@
+FROM fedora:35
+
+ENV LANG=C.UTF-8
+ENV LC_ALL=C.UTF-8
+ENV LC_LANG=C.UTF-8
+ENV ARCH=x64
+ENV CPU=x86_64
+ENV OS=linux
+
+ARG CC=gcc
+ARG CXX=g++
+
+COPY tools /opt/tools
+
+RUN dnf -y update                                                                                 && \
+    dnf -y install sudo wget git openssl-devel bison byacc cmake python                              \
+                   json-c-devel clang gcc gcc-c++ make autoconf libtool gzip bzip2 bzip2-devel       \
+                   gettext-devel ncurses-devel zlib-devel asciidoctor botan2 botan2-devel
+
+RUN  /opt/tools/tools.sh build_and_install_automake
diff --git a/fedora-36-amd64.Dockerfile b/fedora-36-amd64.Dockerfile
@@ -0,0 +1,24 @@
+FROM fedora:36
+
+ENV LANG=C.UTF-8
+ENV LC_ALL=C.UTF-8
+ENV LC_LANG=C.UTF-8
+ENV ARCH=x64
+ENV CPU=x86_64
+ENV OS=linux
+ENV LD_LIBRARY_PATH=/opt/botan/3.1.1/lib
+
+ARG CC=gcc
+ARG CXX=g++
+
+COPY tools /opt/tools
+
+RUN dnf -y update                                                                                 && \
+    dnf -y install sudo wget git openssl-devel bison byacc cmake python                              \
+                   json-c-devel clang gcc gcc-c++ make autoconf libtool gzip bzip2 bzip2-devel       \
+                   gettext-devel ncurses-devel zlib-devel asciidoctor botan2 botan2-devel
+
+RUN /opt/tools/tools.sh build_and_install_libiconv           && \
+    /opt/tools/tools.sh build_and_install_gpg lts            && \
+    /opt/tools/tools.sh build_and_install_gpg stable         && \
+    /opt/tools/tools.sh build_and_install_botan 3.1.1
diff --git a/tools/tools.sh b/tools/tools.sh
@@ -255,22 +255,19 @@ build_and_install_gpg() {
 
     # shellcheck disable=SC2153
   case "${GPG_VERSION}" in
+    head)
+      #                               npth      libgpg-error   libgcrypt  libassuan libksba pinentry gnupg
+      _install_gpg component-git-ref npth-1.6     master         master    master   master   master  master
+
+      ;;
     stable)
       #                              npth libgpg-error libgcrypt libassuan libksba pinentry gnupg
-      _install_gpg component-version 1.6  1.46         1.10.1     2.5.5     1.6.3  1.2.1    2.4.0
+      _install_gpg component-version 1.6  1.47         1.10.2     2.5.6     1.6.4  1.2.1    2.4.3
       ;;
     lts)
       #                              npth libgpg-error libgcrypt libassuan libksba pinentry gnupg
       _install_gpg component-version 1.6  1.46         1.8.10     2.5.5     1.6.3   1.2.1   2.2.41
       ;;
-    #beta)
-      #                              npth    libgpg-error libgcrypt libassuan libksba pinentry gnupg
-      #_install_gpg component-git-ref 2501a48 f73605e      d9c4183   909133b   3df0cd3 0e2e53c  c6702d7
-      #;;
-    "2.3.1")
-      #                              npth libgpg-error libgcrypt libassuan libksba pinentry gnupg
-      _install_gpg component-version 1.6  1.42         1.9.3     2.5.5     1.6.0   1.1.1    2.3.1
-      ;;
     *)
       >&2 echo "\$GPG_VERSION is set to invalid value: ${GPG_VERSION}"
       exit 1