gitlab-ci: Install libtasn1-tools on Fedora based distributions

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3d01f8fc376f4a899c77a76b8d127669dd01431b..a69db94ff36b458cdcf9ff30e4fb9164ccf7c696 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,7 +19,7 @@ variables:
   # Set this to the contents of bootstrap/sha1sum.txt
   # which is generated by bootstrap/template.py --render
   #
-  SAMBA_CI_CONTAINER_TAG: 93278680b4e7086c0bec11a58bc3533f9971c08e
+  SAMBA_CI_CONTAINER_TAG: 1185fa2a316b3bb7e0c24e9fb8279d4c17450809
   # We use the ubuntu1804 image as default as
   # it matches what we have on sn-devel-184.
   SAMBA_CI_CONTAINER_IMAGE: ubuntu1804

diff --git a/bootstrap/config.py b/bootstrap/config.py
index 6d3fb2e5c9c8ff0a8d06ce4860fcae6b58358d41..bd651e28597956059d5a3a468ed5544fd5efca2f 100644 (file)
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -90,7 +90,7 @@ PKGS = [
     ('libgpgme11-dev', 'gpgme-devel'),
     # NOTE: Debian 8+ and Ubuntu 14.04+
     ('libgnutls28-dev', 'gnutls-devel'),
-    ('libtasn1-bin', ''),
+    ('libtasn1-bin', 'libtasn1-tools'),
     ('libtasn1-dev', 'libtasn1-devel'),
     ('', 'quota-devel'),
     ('uuid-dev', 'libuuid-devel'),
@@ -524,6 +524,7 @@ RPM_DISTS = {
             'python3-markdown': 'python3-Markdown',
             'quota-devel': '',
             'glusterfs-api-devel': '',
+            'libtasn1-tools': '', # asn1Parser is part of libtasn1
         }
     }
 }

diff --git a/bootstrap/generated-dists/centos6/bootstrap.sh b/bootstrap/generated-dists/centos6/bootstrap.sh
index 203386bf4473cbe61e82330883ebd63e4b68c0ec..1279bbce7b961e9c8d243dc160753f5578bd8690 100755 (executable)
--- a/bootstrap/generated-dists/centos6/bootstrap.sh
+++ b/bootstrap/generated-dists/centos6/bootstrap.sh
@@ -54,6 +54,7 @@ yum install -y \
     libpcap-devel \
     libsemanage-python \
     libtasn1-devel \
+    libtasn1-tools \
     libtirpc-devel \
     libunwind-devel \
     libuuid-devel \

diff --git a/bootstrap/generated-dists/centos6/packages.yml b/bootstrap/generated-dists/centos6/packages.yml
index 98a89a844f940c9e971d8b3dde5effa3fbaa52c2..cb60034d299e812ad56ed753d68196aa36ce0bee 100644 (file)
--- a/bootstrap/generated-dists/centos6/packages.yml
+++ b/bootstrap/generated-dists/centos6/packages.yml
@@ -42,6 +42,7 @@ packages:
   - libpcap-devel
   - libsemanage-python
   - libtasn1-devel
+  - libtasn1-tools
   - libtirpc-devel
   - libunwind-devel
   - libuuid-devel

diff --git a/bootstrap/generated-dists/centos7/bootstrap.sh b/bootstrap/generated-dists/centos7/bootstrap.sh
index c3ccc4bb0b9a18cb0c5f8ade1d28abd7fbc849c1..81786a80bead7c5ac9059988dbea5dead44134e1 100755 (executable)
--- a/bootstrap/generated-dists/centos7/bootstrap.sh
+++ b/bootstrap/generated-dists/centos7/bootstrap.sh
@@ -54,6 +54,7 @@ yum install -y \
     libpcap-devel \
     libsemanage-python \
     libtasn1-devel \
+    libtasn1-tools \
     libtirpc-devel \
     libunwind-devel \
     libuuid-devel \

diff --git a/bootstrap/generated-dists/centos7/packages.yml b/bootstrap/generated-dists/centos7/packages.yml
index 40c5513d72c9d99f5864f213a05673236522bca1..7f10cd38f1c8a34d5815d85bd75fb188f9a7eb70 100644 (file)
--- a/bootstrap/generated-dists/centos7/packages.yml
+++ b/bootstrap/generated-dists/centos7/packages.yml
@@ -42,6 +42,7 @@ packages:
   - libpcap-devel
   - libsemanage-python
   - libtasn1-devel
+  - libtasn1-tools
   - libtirpc-devel
   - libunwind-devel
   - libuuid-devel

diff --git a/bootstrap/generated-dists/fedora28/bootstrap.sh b/bootstrap/generated-dists/fedora28/bootstrap.sh
index 2c365247e6a0d1c24973caa66f27f527c039e8ce..85b328cc7112ad2f3bafcbcaa01f631039347c75 100755 (executable)
--- a/bootstrap/generated-dists/fedora28/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora28/bootstrap.sh
@@ -57,6 +57,7 @@ dnf install -y \
     libpcap-devel \
     libsemanage-python \
     libtasn1-devel \
+    libtasn1-tools \
     libtirpc-devel \
     libunwind-devel \
     libuuid-devel \

diff --git a/bootstrap/generated-dists/fedora28/packages.yml b/bootstrap/generated-dists/fedora28/packages.yml
index 2961e4c0a509d75ccde6d434b612b8720ef6aed3..3655cdbd27849087b2dbc56116a7daf5899f9144 100644 (file)
--- a/bootstrap/generated-dists/fedora28/packages.yml
+++ b/bootstrap/generated-dists/fedora28/packages.yml
@@ -46,6 +46,7 @@ packages:
   - libpcap-devel
   - libsemanage-python
   - libtasn1-devel
+  - libtasn1-tools
   - libtirpc-devel
   - libunwind-devel
   - libuuid-devel

diff --git a/bootstrap/generated-dists/fedora29/bootstrap.sh b/bootstrap/generated-dists/fedora29/bootstrap.sh
index 2c365247e6a0d1c24973caa66f27f527c039e8ce..85b328cc7112ad2f3bafcbcaa01f631039347c75 100755 (executable)
--- a/bootstrap/generated-dists/fedora29/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora29/bootstrap.sh
@@ -57,6 +57,7 @@ dnf install -y \
     libpcap-devel \
     libsemanage-python \
     libtasn1-devel \
+    libtasn1-tools \
     libtirpc-devel \
     libunwind-devel \
     libuuid-devel \

diff --git a/bootstrap/generated-dists/fedora29/packages.yml b/bootstrap/generated-dists/fedora29/packages.yml
index 2961e4c0a509d75ccde6d434b612b8720ef6aed3..3655cdbd27849087b2dbc56116a7daf5899f9144 100644 (file)
--- a/bootstrap/generated-dists/fedora29/packages.yml
+++ b/bootstrap/generated-dists/fedora29/packages.yml
@@ -46,6 +46,7 @@ packages:
   - libpcap-devel
   - libsemanage-python
   - libtasn1-devel
+  - libtasn1-tools
   - libtirpc-devel
   - libunwind-devel
   - libuuid-devel

diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index a5d74e48a7efb6b72325e0138ba6c318f04fc5c9..02229d245ac21f8c7ba60d71f3d8adca53d17d8b 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-93278680b4e7086c0bec11a58bc3533f9971c08e
+1185fa2a316b3bb7e0c24e9fb8279d4c17450809