[SCM] Samba Shared Repository - branch master updated
Christof Schmitt
cs at samba.org
Wed Nov 13 19:15:02 UTC 2019
The branch, master has been updated
via 5343cec5f0a gitlab-ci: Run samba-fileserver-heimdalkrb5
via 2efc243f1ad bootstrap: Add heimdal-multidev for Debian and Ubuntu
via 7965a204d68 autobuild: Add test for build with system heimdal library
via 85d23236200 krb5_plugin: Fix developer build with newer heimdal system library
via 1aef796e302 krb5_plugin: Use C99 initializer
via 15ddd95d946 selftest: system-heimdal: workaround upstream "host" canon bug
via be2d90b60d1 wscript: Fix build with system heimdal
via 63f8d773275 bootstrap: Remove nettle-devel from package list
from 816205027a1 ctdb-ib: Fix build errors for infiniband transport
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 5343cec5f0a5531af85d72021dba30c31a4a3f1b
Author: Christof Schmitt <cs at samba.org>
Date: Wed Oct 30 14:24:58 2019 -0700
gitlab-ci: Run samba-fileserver-heimdalkrb5
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14179
Signed-off-by: Christof Schmitt <cs at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Autobuild-User(master): Christof Schmitt <cs at samba.org>
Autobuild-Date(master): Wed Nov 13 19:14:25 UTC 2019 on sn-devel-184
commit 2efc243f1ad09eae46f6f99fb0646ecd4356c3f9
Author: Christof Schmitt <cs at samba.org>
Date: Wed Oct 30 13:49:55 2019 -0700
bootstrap: Add heimdal-multidev for Debian and Ubuntu
This is required for testing the build with the
configure option --with-system-heimdalkrb5.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14179
Signed-off-by: Christof Schmitt <cs at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 7965a204d68196acddf553959bb3407125baf31d
Author: Christof Schmitt <cs at samba.org>
Date: Wed Oct 30 13:45:55 2019 -0700
autobuild: Add test for build with system heimdal library
The configure option --with-system-heimdalkrb5 requires --without-ad-dc.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14179
Signed-off-by: Christof Schmitt <cs at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 85d23236200dbe013c09a4f23d982ef1baac240d
Author: Christof Schmitt <cs at samba.org>
Date: Mon Nov 11 13:37:25 2019 -0700
krb5_plugin: Fix developer build with newer heimdal system library
Newer heimdal versions provide a different locator plugin interface. The
function pointer for the old method has been renamed. Use an ifdef to
initialize the correct pointer.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14179
Signed-off-by: Christof Schmitt <cs at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 1aef796e302058ad3327613964fa89abaf940c1c
Author: Christof Schmitt <cs at samba.org>
Date: Mon Nov 11 13:08:28 2019 -0700
krb5_plugin: Use C99 initializer
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14179
Signed-off-by: Christof Schmitt <cs at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 15ddd95d94688ed742a2965c4b269d7c84e2d858
Author: Isaac Boukris <iboukris at samba.org>
Date: Sat Nov 9 15:36:32 2019 +0000
selftest: system-heimdal: workaround upstream "host" canon bug
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14179
Signed-off-by: Isaac Boukris <iboukris at samba.org>
Reviewed-by: Christof Schmitt <cs at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit be2d90b60d19eca408b60fe4e1b49f9b418f1b97
Author: Christof Schmitt <cs at samba.org>
Date: Wed Oct 30 13:15:48 2019 -0700
wscript: Fix build with system heimdal
Ubuntu has heimdal include files in /usr/include/heimdal. As the
kerberos include files are pulled into many files through indirect
includes, add the discovered include paths to EXTRA_INCLUDES to
always have them available.
Also set USING_SYSTEM_KRB5 when enabling the system heimdal build,
to correctly handle the inclusion of the krb5-types.h file.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14179
Signed-off-by: Christof Schmitt <cs at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 63f8d7732756b8a8452ab22ca205a29b27b7d1f1
Author: Christof Schmitt <cs at samba.org>
Date: Wed Oct 30 14:57:02 2019 -0700
bootstrap: Remove nettle-devel from package list
nettle is required as dependency for newer gnutls libraries. The gnutls
development package already depends on the nettle development package,
no need to explicitly list it.
Signed-off-by: Christof Schmit <cs at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
-----------------------------------------------------------------------
Summary of changes:
.gitlab-ci.yml | 5 ++++-
bootstrap/config.py | 5 +----
bootstrap/generated-dists/centos6/bootstrap.sh | 1 -
bootstrap/generated-dists/centos6/packages.yml | 1 -
bootstrap/generated-dists/centos7/bootstrap.sh | 1 -
bootstrap/generated-dists/centos7/packages.yml | 1 -
bootstrap/generated-dists/centos8/bootstrap.sh | 1 -
bootstrap/generated-dists/centos8/packages.yml | 1 -
bootstrap/generated-dists/debian7/bootstrap.sh | 2 +-
bootstrap/generated-dists/debian7/packages.yml | 2 +-
bootstrap/generated-dists/debian8/bootstrap.sh | 2 +-
bootstrap/generated-dists/debian8/packages.yml | 2 +-
bootstrap/generated-dists/debian9/bootstrap.sh | 2 +-
bootstrap/generated-dists/debian9/packages.yml | 2 +-
bootstrap/generated-dists/fedora29/bootstrap.sh | 1 -
bootstrap/generated-dists/fedora29/packages.yml | 1 -
bootstrap/generated-dists/fedora30/bootstrap.sh | 1 -
bootstrap/generated-dists/fedora30/packages.yml | 1 -
bootstrap/generated-dists/fedora31/bootstrap.sh | 1 -
bootstrap/generated-dists/fedora31/packages.yml | 1 -
bootstrap/generated-dists/opensuse150/bootstrap.sh | 1 -
bootstrap/generated-dists/opensuse150/packages.yml | 1 -
bootstrap/generated-dists/opensuse151/bootstrap.sh | 1 -
bootstrap/generated-dists/opensuse151/packages.yml | 1 -
bootstrap/generated-dists/ubuntu1404/bootstrap.sh | 2 +-
bootstrap/generated-dists/ubuntu1404/packages.yml | 2 +-
bootstrap/generated-dists/ubuntu1604/bootstrap.sh | 2 +-
bootstrap/generated-dists/ubuntu1604/packages.yml | 2 +-
bootstrap/generated-dists/ubuntu1804/bootstrap.sh | 2 +-
bootstrap/generated-dists/ubuntu1804/packages.yml | 2 +-
bootstrap/sha1sum.txt | 2 +-
nsswitch/krb5_plugin/winbind_krb5_locator.c | 12 ++++++++----
script/autobuild.py | 12 ++++++++++++
selftest/target/Samba.pm | 6 ++++++
wscript_configure_system_heimdal | 3 +++
35 files changed, 47 insertions(+), 38 deletions(-)
Changeset truncated at 500 lines:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e12f9ebf903..9bd083cb63e 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: 539cd9023fee0703a42dc82e8778a01149fcb679
+ SAMBA_CI_CONTAINER_TAG: 187702e2a9c65f874aa13e5eb1c8b68703e72299
#
# We use the ubuntu1804 image as default as
# it matches what we have on sn-devel-184.
@@ -187,6 +187,9 @@ samba-simpleserver:
samba-fileserver:
extends: .private_template
+samba-ktest-heimdal:
+ extends: .private_template
+
samba-ad-dc-1:
extends: .private_template
diff --git a/bootstrap/config.py b/bootstrap/config.py
index eb1d2b4a9a0..06fd1142f94 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -66,7 +66,6 @@ PKGS = [
# NAME1-dev, NAME2-devel
('lmdb-utils', 'lmdb'),
('mingw-w64', 'mingw64-gcc'),
- ('nettle-dev', 'nettle-devel'),
('zlib1g-dev', 'zlib-devel'),
('libbsd-dev', 'libbsd-devel'),
('libaio-dev', 'libaio-devel'),
@@ -102,6 +101,7 @@ PKGS = [
('libunwind-dev', 'libunwind-devel'), # for back trace
('libglib2.0-dev', 'glib2-devel'),
('libicu-dev', 'libicu-devel'),
+ ('heimdal-multidev', ''),
# NAME1, NAME2
# for debian, locales provide locale support with language packs
@@ -487,7 +487,6 @@ RPM_DISTS = {
'glusterfs-api-devel': '',
'glusterfs-devel': '',
'libcephfs-devel': '',
- 'nettle-devel': 'compat-nettle32-devel',
'gnutls-devel': 'compat-gnutls34-devel',
}
},
@@ -549,7 +548,6 @@ RPM_DISTS = {
'krb5-workstation': 'krb5-client',
'libnsl2-devel': 'libnsl-devel',
'libsemanage-python': 'python2-semanage',
- 'nettle-devel': 'libnettle-devel',
'openldap-devel': 'openldap2-devel',
'perl-Archive-Tar': 'perl-Archive-Tar-Wrapper',
'perl-JSON-Parse': 'perl-JSON-XS',
@@ -582,7 +580,6 @@ RPM_DISTS = {
'krb5-workstation': 'krb5-client',
'libnsl2-devel': 'libnsl-devel',
'libsemanage-python': 'python2-semanage',
- 'nettle-devel': 'libnettle-devel',
'openldap-devel': 'openldap2-devel',
'perl-Archive-Tar': 'perl-Archive-Tar-Wrapper',
'perl-JSON-Parse': 'perl-JSON-XS',
diff --git a/bootstrap/generated-dists/centos6/bootstrap.sh b/bootstrap/generated-dists/centos6/bootstrap.sh
index 1082825e190..129cc3d557b 100755
--- a/bootstrap/generated-dists/centos6/bootstrap.sh
+++ b/bootstrap/generated-dists/centos6/bootstrap.sh
@@ -66,7 +66,6 @@ yum install -y \
make \
mingw64-gcc \
ncurses-devel \
- nettle-devel \
openldap-devel \
pam-devel \
patch \
diff --git a/bootstrap/generated-dists/centos6/packages.yml b/bootstrap/generated-dists/centos6/packages.yml
index 76ad25de37c..a9225035e02 100644
--- a/bootstrap/generated-dists/centos6/packages.yml
+++ b/bootstrap/generated-dists/centos6/packages.yml
@@ -52,7 +52,6 @@ packages:
- make
- mingw64-gcc
- ncurses-devel
- - nettle-devel
- openldap-devel
- pam-devel
- patch
diff --git a/bootstrap/generated-dists/centos7/bootstrap.sh b/bootstrap/generated-dists/centos7/bootstrap.sh
index 6e3bbd288b1..fb8ee8b72f6 100755
--- a/bootstrap/generated-dists/centos7/bootstrap.sh
+++ b/bootstrap/generated-dists/centos7/bootstrap.sh
@@ -23,7 +23,6 @@ yum install -y \
binutils \
bison \
compat-gnutls34-devel \
- compat-nettle32-devel \
cups-devel \
curl \
dbus-devel \
diff --git a/bootstrap/generated-dists/centos7/packages.yml b/bootstrap/generated-dists/centos7/packages.yml
index 3c095961b2a..3d37fd52d51 100644
--- a/bootstrap/generated-dists/centos7/packages.yml
+++ b/bootstrap/generated-dists/centos7/packages.yml
@@ -9,7 +9,6 @@ packages:
- binutils
- bison
- compat-gnutls34-devel
- - compat-nettle32-devel
- cups-devel
- curl
- dbus-devel
diff --git a/bootstrap/generated-dists/centos8/bootstrap.sh b/bootstrap/generated-dists/centos8/bootstrap.sh
index 05972764d9b..4b12476dd36 100755
--- a/bootstrap/generated-dists/centos8/bootstrap.sh
+++ b/bootstrap/generated-dists/centos8/bootstrap.sh
@@ -69,7 +69,6 @@ yum install -y \
make \
mingw64-gcc \
ncurses-devel \
- nettle-devel \
openldap-devel \
pam-devel \
patch \
diff --git a/bootstrap/generated-dists/centos8/packages.yml b/bootstrap/generated-dists/centos8/packages.yml
index 5df66b5bd0f..d8e2d02391f 100644
--- a/bootstrap/generated-dists/centos8/packages.yml
+++ b/bootstrap/generated-dists/centos8/packages.yml
@@ -54,7 +54,6 @@ packages:
- make
- mingw64-gcc
- ncurses-devel
- - nettle-devel
- openldap-devel
- pam-devel
- patch
diff --git a/bootstrap/generated-dists/debian7/bootstrap.sh b/bootstrap/generated-dists/debian7/bootstrap.sh
index afbed5cf699..ea22b863afb 100755
--- a/bootstrap/generated-dists/debian7/bootstrap.sh
+++ b/bootstrap/generated-dists/debian7/bootstrap.sh
@@ -30,6 +30,7 @@ apt-get -y install \
git \
glusterfs-common \
gzip \
+ heimdal-multidev \
hostname \
htop \
krb5-config \
@@ -70,7 +71,6 @@ apt-get -y install \
make \
mawk \
mingw-w64 \
- nettle-dev \
patch \
perl \
perl-modules \
diff --git a/bootstrap/generated-dists/debian7/packages.yml b/bootstrap/generated-dists/debian7/packages.yml
index 958130da942..3303e68d87b 100644
--- a/bootstrap/generated-dists/debian7/packages.yml
+++ b/bootstrap/generated-dists/debian7/packages.yml
@@ -19,6 +19,7 @@ packages:
- git
- glusterfs-common
- gzip
+ - heimdal-multidev
- hostname
- htop
- krb5-config
@@ -59,7 +60,6 @@ packages:
- make
- mawk
- mingw-w64
- - nettle-dev
- patch
- perl
- perl-modules
diff --git a/bootstrap/generated-dists/debian8/bootstrap.sh b/bootstrap/generated-dists/debian8/bootstrap.sh
index c28b8c75af1..687e7723847 100755
--- a/bootstrap/generated-dists/debian8/bootstrap.sh
+++ b/bootstrap/generated-dists/debian8/bootstrap.sh
@@ -30,6 +30,7 @@ apt-get -y install \
git \
glusterfs-common \
gzip \
+ heimdal-multidev \
hostname \
htop \
krb5-config \
@@ -73,7 +74,6 @@ apt-get -y install \
make \
mawk \
mingw-w64 \
- nettle-dev \
patch \
perl \
perl-modules \
diff --git a/bootstrap/generated-dists/debian8/packages.yml b/bootstrap/generated-dists/debian8/packages.yml
index ac02aaa98fe..008d58c9514 100644
--- a/bootstrap/generated-dists/debian8/packages.yml
+++ b/bootstrap/generated-dists/debian8/packages.yml
@@ -19,6 +19,7 @@ packages:
- git
- glusterfs-common
- gzip
+ - heimdal-multidev
- hostname
- htop
- krb5-config
@@ -62,7 +63,6 @@ packages:
- make
- mawk
- mingw-w64
- - nettle-dev
- patch
- perl
- perl-modules
diff --git a/bootstrap/generated-dists/debian9/bootstrap.sh b/bootstrap/generated-dists/debian9/bootstrap.sh
index 06943efaae0..6970c477b38 100755
--- a/bootstrap/generated-dists/debian9/bootstrap.sh
+++ b/bootstrap/generated-dists/debian9/bootstrap.sh
@@ -30,6 +30,7 @@ apt-get -y install \
git \
glusterfs-common \
gzip \
+ heimdal-multidev \
hostname \
htop \
krb5-config \
@@ -73,7 +74,6 @@ apt-get -y install \
make \
mawk \
mingw-w64 \
- nettle-dev \
patch \
perl \
perl-modules \
diff --git a/bootstrap/generated-dists/debian9/packages.yml b/bootstrap/generated-dists/debian9/packages.yml
index 81b76bbf6f3..5943f28704b 100644
--- a/bootstrap/generated-dists/debian9/packages.yml
+++ b/bootstrap/generated-dists/debian9/packages.yml
@@ -19,6 +19,7 @@ packages:
- git
- glusterfs-common
- gzip
+ - heimdal-multidev
- hostname
- htop
- krb5-config
@@ -62,7 +63,6 @@ packages:
- make
- mawk
- mingw-w64
- - nettle-dev
- patch
- perl
- perl-modules
diff --git a/bootstrap/generated-dists/fedora29/bootstrap.sh b/bootstrap/generated-dists/fedora29/bootstrap.sh
index a46bb5f6fcf..1c8357c5cb5 100755
--- a/bootstrap/generated-dists/fedora29/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora29/bootstrap.sh
@@ -67,7 +67,6 @@ dnf install -y \
make \
mingw64-gcc \
ncurses-devel \
- nettle-devel \
openldap-devel \
pam-devel \
patch \
diff --git a/bootstrap/generated-dists/fedora29/packages.yml b/bootstrap/generated-dists/fedora29/packages.yml
index 023889bcb4c..dc37c6f15dd 100644
--- a/bootstrap/generated-dists/fedora29/packages.yml
+++ b/bootstrap/generated-dists/fedora29/packages.yml
@@ -56,7 +56,6 @@ packages:
- make
- mingw64-gcc
- ncurses-devel
- - nettle-devel
- openldap-devel
- pam-devel
- patch
diff --git a/bootstrap/generated-dists/fedora30/bootstrap.sh b/bootstrap/generated-dists/fedora30/bootstrap.sh
index a46bb5f6fcf..1c8357c5cb5 100755
--- a/bootstrap/generated-dists/fedora30/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora30/bootstrap.sh
@@ -67,7 +67,6 @@ dnf install -y \
make \
mingw64-gcc \
ncurses-devel \
- nettle-devel \
openldap-devel \
pam-devel \
patch \
diff --git a/bootstrap/generated-dists/fedora30/packages.yml b/bootstrap/generated-dists/fedora30/packages.yml
index 023889bcb4c..dc37c6f15dd 100644
--- a/bootstrap/generated-dists/fedora30/packages.yml
+++ b/bootstrap/generated-dists/fedora30/packages.yml
@@ -56,7 +56,6 @@ packages:
- make
- mingw64-gcc
- ncurses-devel
- - nettle-devel
- openldap-devel
- pam-devel
- patch
diff --git a/bootstrap/generated-dists/fedora31/bootstrap.sh b/bootstrap/generated-dists/fedora31/bootstrap.sh
index 548bba30f22..b423481af67 100755
--- a/bootstrap/generated-dists/fedora31/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora31/bootstrap.sh
@@ -66,7 +66,6 @@ dnf install -y \
make \
mingw64-gcc \
ncurses-devel \
- nettle-devel \
openldap-devel \
pam-devel \
patch \
diff --git a/bootstrap/generated-dists/fedora31/packages.yml b/bootstrap/generated-dists/fedora31/packages.yml
index f6d71871938..d56faf8a859 100644
--- a/bootstrap/generated-dists/fedora31/packages.yml
+++ b/bootstrap/generated-dists/fedora31/packages.yml
@@ -55,7 +55,6 @@ packages:
- make
- mingw64-gcc
- ncurses-devel
- - nettle-devel
- openldap-devel
- pam-devel
- patch
diff --git a/bootstrap/generated-dists/opensuse150/bootstrap.sh b/bootstrap/generated-dists/opensuse150/bootstrap.sh
index 940bd3dc177..a970cde7679 100755
--- a/bootstrap/generated-dists/opensuse150/bootstrap.sh
+++ b/bootstrap/generated-dists/opensuse150/bootstrap.sh
@@ -51,7 +51,6 @@ zypper --non-interactive install \
libcephfs-devel \
libicu-devel \
libjansson-devel \
- libnettle-devel \
libnsl-devel \
libpcap-devel \
libtasn1-devel \
diff --git a/bootstrap/generated-dists/opensuse150/packages.yml b/bootstrap/generated-dists/opensuse150/packages.yml
index f108d386a0a..62a4270600a 100644
--- a/bootstrap/generated-dists/opensuse150/packages.yml
+++ b/bootstrap/generated-dists/opensuse150/packages.yml
@@ -39,7 +39,6 @@ packages:
- libcephfs-devel
- libicu-devel
- libjansson-devel
- - libnettle-devel
- libnsl-devel
- libpcap-devel
- libtasn1-devel
diff --git a/bootstrap/generated-dists/opensuse151/bootstrap.sh b/bootstrap/generated-dists/opensuse151/bootstrap.sh
index 940bd3dc177..a970cde7679 100755
--- a/bootstrap/generated-dists/opensuse151/bootstrap.sh
+++ b/bootstrap/generated-dists/opensuse151/bootstrap.sh
@@ -51,7 +51,6 @@ zypper --non-interactive install \
libcephfs-devel \
libicu-devel \
libjansson-devel \
- libnettle-devel \
libnsl-devel \
libpcap-devel \
libtasn1-devel \
diff --git a/bootstrap/generated-dists/opensuse151/packages.yml b/bootstrap/generated-dists/opensuse151/packages.yml
index f108d386a0a..62a4270600a 100644
--- a/bootstrap/generated-dists/opensuse151/packages.yml
+++ b/bootstrap/generated-dists/opensuse151/packages.yml
@@ -39,7 +39,6 @@ packages:
- libcephfs-devel
- libicu-devel
- libjansson-devel
- - libnettle-devel
- libnsl-devel
- libpcap-devel
- libtasn1-devel
diff --git a/bootstrap/generated-dists/ubuntu1404/bootstrap.sh b/bootstrap/generated-dists/ubuntu1404/bootstrap.sh
index 78a1379d140..e671c7a50c0 100755
--- a/bootstrap/generated-dists/ubuntu1404/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1404/bootstrap.sh
@@ -29,6 +29,7 @@ apt-get -y install \
gdb \
git \
gzip \
+ heimdal-multidev \
hostname \
htop \
krb5-config \
@@ -71,7 +72,6 @@ apt-get -y install \
make \
mawk \
mingw-w64 \
- nettle-dev \
patch \
perl \
perl-modules \
diff --git a/bootstrap/generated-dists/ubuntu1404/packages.yml b/bootstrap/generated-dists/ubuntu1404/packages.yml
index 5a67ba7b8ec..af577b3a329 100644
--- a/bootstrap/generated-dists/ubuntu1404/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1404/packages.yml
@@ -18,6 +18,7 @@ packages:
- gdb
- git
- gzip
+ - heimdal-multidev
- hostname
- htop
- krb5-config
@@ -60,7 +61,6 @@ packages:
- make
- mawk
- mingw-w64
- - nettle-dev
- patch
- perl
- perl-modules
diff --git a/bootstrap/generated-dists/ubuntu1604/bootstrap.sh b/bootstrap/generated-dists/ubuntu1604/bootstrap.sh
index 6226b51a6db..cfac3a06211 100755
--- a/bootstrap/generated-dists/ubuntu1604/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1604/bootstrap.sh
@@ -29,6 +29,7 @@ apt-get -y install \
gdb \
git \
gzip \
+ heimdal-multidev \
hostname \
htop \
krb5-config \
@@ -72,7 +73,6 @@ apt-get -y install \
make \
mawk \
mingw-w64 \
- nettle-dev \
patch \
perl \
perl-modules \
diff --git a/bootstrap/generated-dists/ubuntu1604/packages.yml b/bootstrap/generated-dists/ubuntu1604/packages.yml
index b9b145488aa..7efddb7bbbd 100644
--- a/bootstrap/generated-dists/ubuntu1604/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1604/packages.yml
@@ -18,6 +18,7 @@ packages:
- gdb
- git
- gzip
+ - heimdal-multidev
- hostname
- htop
- krb5-config
@@ -61,7 +62,6 @@ packages:
- make
- mawk
- mingw-w64
- - nettle-dev
- patch
- perl
- perl-modules
diff --git a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
index f5a1edddf31..0e5c611665b 100755
--- a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
@@ -30,6 +30,7 @@ apt-get -y install \
git \
glusterfs-common \
gzip \
+ heimdal-multidev \
hostname \
htop \
krb5-config \
@@ -74,7 +75,6 @@ apt-get -y install \
make \
mawk \
mingw-w64 \
- nettle-dev \
patch \
perl \
perl-modules \
diff --git a/bootstrap/generated-dists/ubuntu1804/packages.yml b/bootstrap/generated-dists/ubuntu1804/packages.yml
index 0e37e70bc97..2045f092f16 100644
--- a/bootstrap/generated-dists/ubuntu1804/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1804/packages.yml
@@ -19,6 +19,7 @@ packages:
- git
- glusterfs-common
- gzip
+ - heimdal-multidev
- hostname
- htop
- krb5-config
@@ -63,7 +64,6 @@ packages:
- make
- mawk
- mingw-w64
- - nettle-dev
- patch
- perl
- perl-modules
diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
--
Samba Shared Repository
More information about the samba-cvs
mailing list