diff options
34 files changed, 33 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 435c10f33e7..515fb117902 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,7 +22,7 @@ variables: # Set this to the contents of bootstrap/sha1sum.txt # which is generated by bootstrap/template.py --render # - SAMBA_CI_CONTAINER_TAG: f0cc64e22c612eb0599984cfc5dd20f36858db59 + SAMBA_CI_CONTAINER_TAG: 36dd95324f5406f62312648e83fde78a8267b386 # # We use the ubuntu1804 image as default as # it matches what we have on sn-devel-184. diff --git a/bootstrap/config.py b/bootstrap/config.py index a135456866c..b7ad2f68a53 100644 --- a/bootstrap/config.py +++ b/bootstrap/config.py @@ -37,6 +37,7 @@ COMMON = [ 'binutils', 'bison', 'curl', + 'chrpath', 'flex', 'gcc', 'gdb', diff --git a/bootstrap/generated-dists/centos6/bootstrap.sh b/bootstrap/generated-dists/centos6/bootstrap.sh index 129cc3d557b..551d9e773a3 100755 --- a/bootstrap/generated-dists/centos6/bootstrap.sh +++ b/bootstrap/generated-dists/centos6/bootstrap.sh @@ -22,6 +22,7 @@ yum install -y \ bind-utils \ binutils \ bison \ + chrpath \ cups-devel \ curl \ dbus-devel \ diff --git a/bootstrap/generated-dists/centos6/packages.yml b/bootstrap/generated-dists/centos6/packages.yml index a9225035e02..86eb719d641 100644 --- a/bootstrap/generated-dists/centos6/packages.yml +++ b/bootstrap/generated-dists/centos6/packages.yml @@ -8,6 +8,7 @@ packages: - bind-utils - binutils - bison + - chrpath - cups-devel - curl - dbus-devel diff --git a/bootstrap/generated-dists/centos7/bootstrap.sh b/bootstrap/generated-dists/centos7/bootstrap.sh index fb8ee8b72f6..08debda480b 100755 --- a/bootstrap/generated-dists/centos7/bootstrap.sh +++ b/bootstrap/generated-dists/centos7/bootstrap.sh @@ -22,6 +22,7 @@ yum install -y \ bind-utils \ binutils \ bison \ + chrpath \ compat-gnutls34-devel \ cups-devel \ curl \ diff --git a/bootstrap/generated-dists/centos7/packages.yml b/bootstrap/generated-dists/centos7/packages.yml index 3d37fd52d51..9b93461ff2c 100644 --- a/bootstrap/generated-dists/centos7/packages.yml +++ b/bootstrap/generated-dists/centos7/packages.yml @@ -8,6 +8,7 @@ packages: - bind-utils - binutils - bison + - chrpath - compat-gnutls34-devel - cups-devel - curl diff --git a/bootstrap/generated-dists/centos8/bootstrap.sh b/bootstrap/generated-dists/centos8/bootstrap.sh index 4b12476dd36..e19a8b169c7 100755 --- a/bootstrap/generated-dists/centos8/bootstrap.sh +++ b/bootstrap/generated-dists/centos8/bootstrap.sh @@ -23,6 +23,7 @@ yum install -y \ bind-utils \ binutils \ bison \ + chrpath \ cups-devel \ curl \ dbus-devel \ diff --git a/bootstrap/generated-dists/centos8/packages.yml b/bootstrap/generated-dists/centos8/packages.yml index d8e2d02391f..a86bbbdc620 100644 --- a/bootstrap/generated-dists/centos8/packages.yml +++ b/bootstrap/generated-dists/centos8/packages.yml @@ -8,6 +8,7 @@ packages: - bind-utils - binutils - bison + - chrpath - cups-devel - curl - dbus-devel diff --git a/bootstrap/generated-dists/debian10/bootstrap.sh b/bootstrap/generated-dists/debian10/bootstrap.sh index 6970c477b38..758c86f22af 100755 --- a/bootstrap/generated-dists/debian10/bootstrap.sh +++ b/bootstrap/generated-dists/debian10/bootstrap.sh @@ -19,6 +19,7 @@ apt-get -y install \ binutils \ bison \ build-essential \ + chrpath \ curl \ debhelper \ dnsutils \ diff --git a/bootstrap/generated-dists/debian10/packages.yml b/bootstrap/generated-dists/debian10/packages.yml index 5943f28704b..f5115e99025 100644 --- a/bootstrap/generated-dists/debian10/packages.yml +++ b/bootstrap/generated-dists/debian10/packages.yml @@ -8,6 +8,7 @@ packages: - binutils - bison - build-essential + - chrpath - curl - debhelper - dnsutils diff --git a/bootstrap/generated-dists/debian7/bootstrap.sh b/bootstrap/generated-dists/debian7/bootstrap.sh index ea22b863afb..d201695fc03 100755 --- a/bootstrap/generated-dists/debian7/bootstrap.sh +++ b/bootstrap/generated-dists/debian7/bootstrap.sh @@ -19,6 +19,7 @@ apt-get -y install \ binutils \ bison \ build-essential \ + chrpath \ curl \ debhelper \ dnsutils \ diff --git a/bootstrap/generated-dists/debian7/packages.yml b/bootstrap/generated-dists/debian7/packages.yml index 3303e68d87b..541704e8b21 100644 --- a/bootstrap/generated-dists/debian7/packages.yml +++ b/bootstrap/generated-dists/debian7/packages.yml @@ -8,6 +8,7 @@ packages: - binutils - bison - build-essential + - chrpath - curl - debhelper - dnsutils diff --git a/bootstrap/generated-dists/debian8/bootstrap.sh b/bootstrap/generated-dists/debian8/bootstrap.sh index 687e7723847..c810ad89009 100755 --- a/bootstrap/generated-dists/debian8/bootstrap.sh +++ b/bootstrap/generated-dists/debian8/bootstrap.sh @@ -19,6 +19,7 @@ apt-get -y install \ binutils \ bison \ build-essential \ + chrpath \ curl \ debhelper \ dnsutils \ diff --git a/bootstrap/generated-dists/debian8/packages.yml b/bootstrap/generated-dists/debian8/packages.yml index 008d58c9514..170733a19f6 100644 --- a/bootstrap/generated-dists/debian8/packages.yml +++ b/bootstrap/generated-dists/debian8/packages.yml @@ -8,6 +8,7 @@ packages: - binutils - bison - build-essential + - chrpath - curl - debhelper - dnsutils diff --git a/bootstrap/generated-dists/debian9/bootstrap.sh b/bootstrap/generated-dists/debian9/bootstrap.sh index 6970c477b38..758c86f22af 100755 --- a/bootstrap/generated-dists/debian9/bootstrap.sh +++ b/bootstrap/generated-dists/debian9/bootstrap.sh @@ -19,6 +19,7 @@ apt-get -y install \ binutils \ bison \ build-essential \ + chrpath \ curl \ debhelper \ dnsutils \ diff --git a/bootstrap/generated-dists/debian9/packages.yml b/bootstrap/generated-dists/debian9/packages.yml index 5943f28704b..f5115e99025 100644 --- a/bootstrap/generated-dists/debian9/packages.yml +++ b/bootstrap/generated-dists/debian9/packages.yml @@ -8,6 +8,7 @@ packages: - binutils - bison - build-essential + - chrpath - curl - debhelper - dnsutils diff --git a/bootstrap/generated-dists/fedora29/bootstrap.sh b/bootstrap/generated-dists/fedora29/bootstrap.sh index 1c8357c5cb5..9c094aae396 100755 --- a/bootstrap/generated-dists/fedora29/bootstrap.sh +++ b/bootstrap/generated-dists/fedora29/bootstrap.sh @@ -19,6 +19,7 @@ dnf install -y \ bind-utils \ binutils \ bison \ + chrpath \ cups-devel \ curl \ dbus-devel \ diff --git a/bootstrap/generated-dists/fedora29/packages.yml b/bootstrap/generated-dists/fedora29/packages.yml index dc37c6f15dd..be10535bfa1 100644 --- a/bootstrap/generated-dists/fedora29/packages.yml +++ b/bootstrap/generated-dists/fedora29/packages.yml @@ -8,6 +8,7 @@ packages: - bind-utils - binutils - bison + - chrpath - cups-devel - curl - dbus-devel diff --git a/bootstrap/generated-dists/fedora30/bootstrap.sh b/bootstrap/generated-dists/fedora30/bootstrap.sh index 1c8357c5cb5..9c094aae396 100755 --- a/bootstrap/generated-dists/fedora30/bootstrap.sh +++ b/bootstrap/generated-dists/fedora30/bootstrap.sh @@ -19,6 +19,7 @@ dnf install -y \ bind-utils \ binutils \ bison \ + chrpath \ cups-devel \ curl \ dbus-devel \ diff --git a/bootstrap/generated-dists/fedora30/packages.yml b/bootstrap/generated-dists/fedora30/packages.yml index dc37c6f15dd..be10535bfa1 100644 --- a/bootstrap/generated-dists/fedora30/packages.yml +++ b/bootstrap/generated-dists/fedora30/packages.yml @@ -8,6 +8,7 @@ packages: - bind-utils - binutils - bison + - chrpath - cups-devel - curl - dbus-devel diff --git a/bootstrap/generated-dists/fedora31/bootstrap.sh b/bootstrap/generated-dists/fedora31/bootstrap.sh index b423481af67..b882489baa2 100755 --- a/bootstrap/generated-dists/fedora31/bootstrap.sh +++ b/bootstrap/generated-dists/fedora31/bootstrap.sh @@ -19,6 +19,7 @@ dnf install -y \ bind-utils \ binutils \ bison \ + chrpath \ cups-devel \ curl \ dbus-devel \ diff --git a/bootstrap/generated-dists/fedora31/packages.yml b/bootstrap/generated-dists/fedora31/packages.yml index d56faf8a859..d407300b3ef 100644 --- a/bootstrap/generated-dists/fedora31/packages.yml +++ b/bootstrap/generated-dists/fedora31/packages.yml @@ -8,6 +8,7 @@ packages: - bind-utils - binutils - bison + - chrpath - cups-devel - curl - dbus-devel diff --git a/bootstrap/generated-dists/opensuse150/bootstrap.sh b/bootstrap/generated-dists/opensuse150/bootstrap.sh index a970cde7679..591da07b1d8 100755 --- a/bootstrap/generated-dists/opensuse150/bootstrap.sh +++ b/bootstrap/generated-dists/opensuse150/bootstrap.sh @@ -19,6 +19,7 @@ zypper --non-interactive install \ bind-utils \ binutils \ bison \ + chrpath \ cups-devel \ curl \ dbus-1-devel \ diff --git a/bootstrap/generated-dists/opensuse150/packages.yml b/bootstrap/generated-dists/opensuse150/packages.yml index 62a4270600a..ba60caba868 100644 --- a/bootstrap/generated-dists/opensuse150/packages.yml +++ b/bootstrap/generated-dists/opensuse150/packages.yml @@ -7,6 +7,7 @@ packages: - bind-utils - binutils - bison + - chrpath - cups-devel - curl - dbus-1-devel diff --git a/bootstrap/generated-dists/opensuse151/bootstrap.sh b/bootstrap/generated-dists/opensuse151/bootstrap.sh index a970cde7679..591da07b1d8 100755 --- a/bootstrap/generated-dists/opensuse151/bootstrap.sh +++ b/bootstrap/generated-dists/opensuse151/bootstrap.sh @@ -19,6 +19,7 @@ zypper --non-interactive install \ bind-utils \ binutils \ bison \ + chrpath \ cups-devel \ curl \ dbus-1-devel \ diff --git a/bootstrap/generated-dists/opensuse151/packages.yml b/bootstrap/generated-dists/opensuse151/packages.yml index 62a4270600a..ba60caba868 100644 --- a/bootstrap/generated-dists/opensuse151/packages.yml +++ b/bootstrap/generated-dists/opensuse151/packages.yml @@ -7,6 +7,7 @@ packages: - bind-utils - binutils - bison + - chrpath - cups-devel - curl - dbus-1-devel diff --git a/bootstrap/generated-dists/ubuntu1404/bootstrap.sh b/bootstrap/generated-dists/ubuntu1404/bootstrap.sh index e671c7a50c0..01dddb85286 100755 --- a/bootstrap/generated-dists/ubuntu1404/bootstrap.sh +++ b/bootstrap/generated-dists/ubuntu1404/bootstrap.sh @@ -19,6 +19,7 @@ apt-get -y install \ binutils \ bison \ build-essential \ + chrpath \ curl \ debhelper \ dnsutils \ diff --git a/bootstrap/generated-dists/ubuntu1404/packages.yml b/bootstrap/generated-dists/ubuntu1404/packages.yml index af577b3a329..52e2b0c783f 100644 --- a/bootstrap/generated-dists/ubuntu1404/packages.yml +++ b/bootstrap/generated-dists/ubuntu1404/packages.yml @@ -8,6 +8,7 @@ packages: - binutils - bison - build-essential + - chrpath - curl - debhelper - dnsutils diff --git a/bootstrap/generated-dists/ubuntu1604/bootstrap.sh b/bootstrap/generated-dists/ubuntu1604/bootstrap.sh index cfac3a06211..04ceb1822c4 100755 --- a/bootstrap/generated-dists/ubuntu1604/bootstrap.sh +++ b/bootstrap/generated-dists/ubuntu1604/bootstrap.sh @@ -19,6 +19,7 @@ apt-get -y install \ binutils \ bison \ build-essential \ + chrpath \ curl \ debhelper \ dnsutils \ diff --git a/bootstrap/generated-dists/ubuntu1604/packages.yml b/bootstrap/generated-dists/ubuntu1604/packages.yml index 7efddb7bbbd..c6cb5e460ae 100644 --- a/bootstrap/generated-dists/ubuntu1604/packages.yml +++ b/bootstrap/generated-dists/ubuntu1604/packages.yml @@ -8,6 +8,7 @@ packages: - binutils - bison - build-essential + - chrpath - curl - debhelper - dnsutils diff --git a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh index 0e5c611665b..e07f1863c31 100755 --- a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh +++ b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh @@ -19,6 +19,7 @@ apt-get -y install \ binutils \ bison \ build-essential \ + chrpath \ curl \ debhelper \ dnsutils \ diff --git a/bootstrap/generated-dists/ubuntu1804/packages.yml b/bootstrap/generated-dists/ubuntu1804/packages.yml index 2045f092f16..d70426ca5f2 100644 --- a/bootstrap/generated-dists/ubuntu1804/packages.yml +++ b/bootstrap/generated-dists/ubuntu1804/packages.yml @@ -8,6 +8,7 @@ packages: - binutils - bison - build-essential + - chrpath - curl - debhelper - dnsutils diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt index 8117f01d9b4..c9bf561e666 100644 --- a/bootstrap/sha1sum.txt +++ b/bootstrap/sha1sum.txt @@ -1 +1 @@ -f0cc64e22c612eb0599984cfc5dd20f36858db59 +36dd95324f5406f62312648e83fde78a8267b386 diff --git a/lib/fuzzing/oss-fuzz/build_image.sh b/lib/fuzzing/oss-fuzz/build_image.sh index 6dcbd16a75a..5df07dc43be 100755 --- a/lib/fuzzing/oss-fuzz/build_image.sh +++ b/lib/fuzzing/oss-fuzz/build_image.sh @@ -5,6 +5,3 @@ SCRIPT_DIR=`dirname $0` $SCRIPT_DIR/../../../bootstrap/generated-dists/$DIST/bootstrap.sh $SCRIPT_DIR/../../../bootstrap/generated-dists/$DIST/locale.sh - -apt-get install chrpath - |