[SCM] Samba Shared Repository - branch master updated

[Martin Schwenke]

The branch, master has been updated
       via  6601b3ac544 bootstrap: Update distro list in README.md
       via  1c59f49aaed bootstrap: Cope with case changes in CentOS 8 repo names
      from  49256925996 libsmb: Remove unused ads_dns_query_* routines

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 6601b3ac544244563a8cd3cdb5a4bc7da1b4a759
Author: Martin Schwenke <martin at meltin.net>
Date:   Fri Dec 11 15:57:37 2020 +1100

    bootstrap: Update distro list in README.md
    
    Update examples to make them valid.
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    
    Autobuild-User(master): Martin Schwenke <martins at samba.org>
    Autobuild-Date(master): Tue Dec 15 12:03:58 UTC 2020 on sn-devel-184

commit 1c59f49aaede8ec1662d4e49aef84fcd902a8a76
Author: Martin Schwenke <martin at meltin.net>
Date:   Wed Dec 9 00:03:47 2020 +1100

    bootstrap: Cope with case changes in CentOS 8 repo names
    
    RN: Be more flexible with repository names in CentOS 8 test environments
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14594
    Signed-off-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 .gitlab-ci.yml                                 |  2 +-
 bootstrap/README.md                            | 12 ++++++------
 bootstrap/config.py                            |  6 ++++--
 bootstrap/generated-dists/centos8/bootstrap.sh |  6 ++++--
 bootstrap/sha1sum.txt                          |  2 +-
 5 files changed, 16 insertions(+), 12 deletions(-)


Changeset truncated at 500 lines:

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index accaced66a0..7a7582cb6db 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,7 +32,7 @@ variables:
   # Set this to the contents of bootstrap/sha1sum.txt
   # which is generated by bootstrap/template.py --render
   #
-  SAMBA_CI_CONTAINER_TAG: 42ecbfbf716fa85ce251a955de72a92af26fc7b2
+  SAMBA_CI_CONTAINER_TAG: c4c00eb35cae36d8d6e752ee01fd943432993721
   #
   # We use the ubuntu1804 image as default as
   # it matches what we have on sn-devel-184.
diff --git a/bootstrap/README.md b/bootstrap/README.md
index d4f30955197..47ef1c67836 100644
--- a/bootstrap/README.md
+++ b/bootstrap/README.md
@@ -12,8 +12,8 @@ A pure python3 module with CLI to bootstrap Samba envs for multiple distribution
 
 ## Supported Distributions
 
-deb: Debian 7|8|9|10, Ubuntu 1404|1604|1804
-rpm: CentOS 6|7, Fedora 28|29, openSUSE Leap 15.0|15.1
+deb: Debian 10, Ubuntu 1604|1804|2004
+rpm: CentOS 7|8, Fedora 32|33, openSUSE Leap 15.1|15.2
 
 Easy to add more.
 
@@ -86,14 +86,14 @@ With Vagrant:
 
  cd bootstrap/generated-dists/
  vagrant up   # start all
- vagrant up debian9  # start one
- vagrant ssh debian9
- vagrant destroy debian9  # destroy one
+ vagrant up debian10  # start one
+ vagrant ssh debian10
+ vagrant destroy debian10  # destroy one
  vagrant destroy  # destroy all
 
 Or a remote/cloud machine:
 
- scp bootstrap/generated-dists/fedora30/bootstrap.sh USER at IP:
+ scp bootstrap/generated-dists/fedora33/bootstrap.sh USER at IP:
  ssh USER at IP
  sudo bash ./bootstrap.sh
 
diff --git a/bootstrap/config.py b/bootstrap/config.py
index 982ebae1cd1..8383aeb392d 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -235,8 +235,10 @@ yum install -y dnf-plugins-core
 yum install -y epel-release
 
 yum -v repolist all
-yum config-manager --set-enabled PowerTools -y
-yum config-manager --set-enabled Devel -y
+yum config-manager --set-enabled PowerTools -y || \
+    yum config-manager --set-enabled powertools -y
+yum config-manager --set-enabled Devel -y || \
+    yum config-manager --set-enabled devel -y
 yum update -y
 
 yum install -y \
diff --git a/bootstrap/generated-dists/centos8/bootstrap.sh b/bootstrap/generated-dists/centos8/bootstrap.sh
index e5167a2b561..b9f2df67645 100755
--- a/bootstrap/generated-dists/centos8/bootstrap.sh
+++ b/bootstrap/generated-dists/centos8/bootstrap.sh
@@ -12,8 +12,10 @@ yum install -y dnf-plugins-core
 yum install -y epel-release
 
 yum -v repolist all
-yum config-manager --set-enabled PowerTools -y
-yum config-manager --set-enabled Devel -y
+yum config-manager --set-enabled PowerTools -y || \
+    yum config-manager --set-enabled powertools -y
+yum config-manager --set-enabled Devel -y || \
+    yum config-manager --set-enabled devel -y
 yum update -y
 
 yum install -y \
diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index 46493c16eb0..3e87c2ed1b0 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-42ecbfbf716fa85ce251a955de72a92af26fc7b2
+c4c00eb35cae36d8d6e752ee01fd943432993721


-- 
Samba Shared Repository