gitlab-ci: Enable fedora29 and update generated dists

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Thu Apr 25 11:46:23 UTC 2019 on sn-devel-184

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e43000548cad19bec28c78c547c668162d168e84..82d8859e30da6a9513eaa7d5646b381d553bd0d1 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: 5c2b831fb6aef8abd25dbdc6ade53ba2ebad1a1c
+  SAMBA_CI_CONTAINER_TAG: 735b9b509e6928bc71fe4442798e4fe110a98788
   #
   # The following images are available
   # Please see the samba-o3 sections at the end of this file!
@@ -30,6 +30,7 @@ variables:
   SAMBA_CI_CONTAINER_IMAGE_ubuntu1404: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-ubuntu1404:${SAMBA_CI_CONTAINER_TAG}
   SAMBA_CI_CONTAINER_IMAGE_debian9: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-debian9:${SAMBA_CI_CONTAINER_TAG}
   SAMBA_CI_CONTAINER_IMAGE_opensuse150: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-opensuse150:${SAMBA_CI_CONTAINER_TAG}
+  SAMBA_CI_CONTAINER_IMAGE_fedora29: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-fedora29:${SAMBA_CI_CONTAINER_TAG}
 
 include:
   # The image creation details are specified in a separate file
@@ -205,6 +206,10 @@ opensuse150-samba-o3:
   extends: .samba-o3-template
   image: $SAMBA_CI_CONTAINER_IMAGE_opensuse150
 
+fedora29-samba-o3:
+  extends: .samba-o3-template
+  image: $SAMBA_CI_CONTAINER_IMAGE_fedora29
+
 #
 # Keep the samba-o3 sections at the end ...
 #

diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml
index f6bbd9e02850da63d33eb391ad5b6be414c74e23..515b6ac66db822f74b22aaed129526d3adcf4344 100644 (file)
--- a/bootstrap/.gitlab-ci.yml
+++ b/bootstrap/.gitlab-ci.yml
@@ -101,7 +101,7 @@ debian7:
   extends: .build_image_template_force_broken
 
 fedora29:
-  extends: .build_image_template_force_broken
+  extends: .build_image_template
 
 fedora28:
   extends: .build_image_template_force_broken

diff --git a/bootstrap/generated-dists/centos6/bootstrap.sh b/bootstrap/generated-dists/centos6/bootstrap.sh
index be21d8bec6991d4621ce30f43ce00c9619752c62..fdd04385a02a79b2dce0e103c1189b28f24fdb9a 100755 (executable)
--- a/bootstrap/generated-dists/centos6/bootstrap.sh
+++ b/bootstrap/generated-dists/centos6/bootstrap.sh
@@ -99,6 +99,7 @@ yum -y -q --verbose install \
     tar \
     tree \
     which \
+    xfsprogs-devel \
     yum-utils \
     zlib-devel
 

diff --git a/bootstrap/generated-dists/centos6/packages.yml b/bootstrap/generated-dists/centos6/packages.yml
index c7953bd60f9d889548674481b941345ed9f4bf47..307d31826e6c094cfdc8a93735fa651138d0a08d 100644 (file)
--- a/bootstrap/generated-dists/centos6/packages.yml
+++ b/bootstrap/generated-dists/centos6/packages.yml
@@ -87,5 +87,6 @@ packages:
   - tar
   - tree
   - which
+  - xfsprogs-devel
   - yum-utils
   - zlib-devel
\ No newline at end of file

diff --git a/bootstrap/generated-dists/centos7/bootstrap.sh b/bootstrap/generated-dists/centos7/bootstrap.sh
index 08a11b7ee934ade583774a847892b8c2d3800be1..122025df729a75af2ca6e62ce5901f1bbc5603ca 100755 (executable)
--- a/bootstrap/generated-dists/centos7/bootstrap.sh
+++ b/bootstrap/generated-dists/centos7/bootstrap.sh
@@ -99,6 +99,7 @@ yum -y -q --verbose install \
     tar \
     tree \
     which \
+    xfsprogs-devel \
     yum-utils \
     zlib-devel
 

diff --git a/bootstrap/generated-dists/centos7/packages.yml b/bootstrap/generated-dists/centos7/packages.yml
index c3bbe7ba4a66fdef881c6c30f1e61c7d4a8272b3..93aa4db8a1100da83196b1add153e109c16f7fc7 100644 (file)
--- a/bootstrap/generated-dists/centos7/packages.yml
+++ b/bootstrap/generated-dists/centos7/packages.yml
@@ -87,5 +87,6 @@ packages:
   - tar
   - tree
   - which
+  - xfsprogs-devel
   - yum-utils
   - zlib-devel
\ No newline at end of file

diff --git a/bootstrap/generated-dists/debian7/bootstrap.sh b/bootstrap/generated-dists/debian7/bootstrap.sh
index a860caf330eca98122d3b232a7dfb6dfbc393e79..a5cb63ace153f0da518dfb6b508ab8519a7e3116 100755 (executable)
--- a/bootstrap/generated-dists/debian7/bootstrap.sh
+++ b/bootstrap/generated-dists/debian7/bootstrap.sh
@@ -28,6 +28,7 @@ apt-get -y install \
     gcc \
     gdb \
     git \
+    glusterfs-common \
     gzip \
     hostname \
     htop \
@@ -41,6 +42,7 @@ apt-get -y install \
     libblkid-dev \
     libbsd-dev \
     libcap-dev \
+    libcephfs-dev \
     libcups2-dev \
     libdbus-1-dev \
     libglib2.0-dev \
@@ -95,6 +97,7 @@ apt-get -y install \
     tar \
     tree \
     uuid-dev \
+    xfslibs-dev \
     xsltproc \
     zlib1g-dev
 

diff --git a/bootstrap/generated-dists/debian7/packages.yml b/bootstrap/generated-dists/debian7/packages.yml
index 80ddb1d2dbd5559b49bd2edbcb7b278ef28ebf8a..03862993de357fde5e67bf68998ec6c87af1399b 100644 (file)
--- a/bootstrap/generated-dists/debian7/packages.yml
+++ b/bootstrap/generated-dists/debian7/packages.yml
@@ -17,6 +17,7 @@ packages:
   - gcc
   - gdb
   - git
+  - glusterfs-common
   - gzip
   - hostname
   - htop
@@ -30,6 +31,7 @@ packages:
   - libblkid-dev
   - libbsd-dev
   - libcap-dev
+  - libcephfs-dev
   - libcups2-dev
   - libdbus-1-dev
   - libglib2.0-dev
@@ -84,5 +86,6 @@ packages:
   - tar
   - tree
   - uuid-dev
+  - xfslibs-dev
   - xsltproc
   - zlib1g-dev
\ No newline at end of file

diff --git a/bootstrap/generated-dists/debian8/bootstrap.sh b/bootstrap/generated-dists/debian8/bootstrap.sh
index 5194507f447a5adeec0e910fecccaee1e9dff1d9..73db186c1d9dc6849a3df95e5271b82e16248409 100755 (executable)
--- a/bootstrap/generated-dists/debian8/bootstrap.sh
+++ b/bootstrap/generated-dists/debian8/bootstrap.sh
@@ -28,6 +28,7 @@ apt-get -y install \
     gcc \
     gdb \
     git \
+    glusterfs-common \
     gzip \
     hostname \
     htop \
@@ -41,6 +42,7 @@ apt-get -y install \
     libblkid-dev \
     libbsd-dev \
     libcap-dev \
+    libcephfs-dev \
     libcups2-dev \
     libdbus-1-dev \
     libglib2.0-dev \
@@ -99,6 +101,7 @@ apt-get -y install \
     tar \
     tree \
     uuid-dev \
+    xfslibs-dev \
     xsltproc \
     zlib1g-dev
 

diff --git a/bootstrap/generated-dists/debian8/packages.yml b/bootstrap/generated-dists/debian8/packages.yml
index 5655fb57d7c02ae034c29dc85930debef7e809ed..7aaeb2a2f0956a54d3e0de7a13298a33adc3ec94 100644 (file)
--- a/bootstrap/generated-dists/debian8/packages.yml
+++ b/bootstrap/generated-dists/debian8/packages.yml
@@ -17,6 +17,7 @@ packages:
   - gcc
   - gdb
   - git
+  - glusterfs-common
   - gzip
   - hostname
   - htop
@@ -30,6 +31,7 @@ packages:
   - libblkid-dev
   - libbsd-dev
   - libcap-dev
+  - libcephfs-dev
   - libcups2-dev
   - libdbus-1-dev
   - libglib2.0-dev
@@ -88,5 +90,6 @@ packages:
   - tar
   - tree
   - uuid-dev
+  - xfslibs-dev
   - xsltproc
   - zlib1g-dev
\ No newline at end of file

diff --git a/bootstrap/generated-dists/debian9/bootstrap.sh b/bootstrap/generated-dists/debian9/bootstrap.sh
index a765307ab7c53d94150bca9a8e051926421b7988..7fa82c9f042f6d6635032f3dd6fa3217e413a3a4 100755 (executable)
--- a/bootstrap/generated-dists/debian9/bootstrap.sh
+++ b/bootstrap/generated-dists/debian9/bootstrap.sh
@@ -28,6 +28,7 @@ apt-get -y install \
     gcc \
     gdb \
     git \
+    glusterfs-common \
     gzip \
     hostname \
     htop \
@@ -41,6 +42,7 @@ apt-get -y install \
     libblkid-dev \
     libbsd-dev \
     libcap-dev \
+    libcephfs-dev \
     libcups2-dev \
     libdbus-1-dev \
     libglib2.0-dev \
@@ -99,6 +101,7 @@ apt-get -y install \
     tar \
     tree \
     uuid-dev \
+    xfslibs-dev \
     xsltproc \
     zlib1g-dev
 

diff --git a/bootstrap/generated-dists/debian9/packages.yml b/bootstrap/generated-dists/debian9/packages.yml
index b4e2013eb47ab8373ebecf337520e7a665bae29f..85736819f58e030d65b080b35aee119ae056bd4c 100644 (file)
--- a/bootstrap/generated-dists/debian9/packages.yml
+++ b/bootstrap/generated-dists/debian9/packages.yml
@@ -17,6 +17,7 @@ packages:
   - gcc
   - gdb
   - git
+  - glusterfs-common
   - gzip
   - hostname
   - htop
@@ -30,6 +31,7 @@ packages:
   - libblkid-dev
   - libbsd-dev
   - libcap-dev
+  - libcephfs-dev
   - libcups2-dev
   - libdbus-1-dev
   - libglib2.0-dev
@@ -88,5 +90,6 @@ packages:
   - tar
   - tree
   - uuid-dev
+  - xfslibs-dev
   - xsltproc
   - zlib1g-dev
\ No newline at end of file

diff --git a/bootstrap/generated-dists/fedora28/bootstrap.sh b/bootstrap/generated-dists/fedora28/bootstrap.sh
index 6793a37b8c9daeb931593c16ca530fad11bec99e..aa9d64c492af84699d469b91b65b9c9552d49e16 100755 (executable)
--- a/bootstrap/generated-dists/fedora28/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora28/bootstrap.sh
@@ -7,9 +7,9 @@
 
 set -xueo pipefail
 
-dnf -y -q update
+dnf update -y
 
-dnf -y -q --verbose install \
+dnf install -y \
     @development-tools \
     acl \
     attr \
@@ -31,6 +31,8 @@ dnf -y -q --verbose install \
     glib2-devel \
     glibc-common \
     glibc-langpack-en \
+    glusterfs-api-devel \
+    glusterfs-devel \
     gnutls-devel \
     gpgme-devel \
     gzip \
@@ -47,6 +49,7 @@ dnf -y -q --verbose install \
     libblkid-devel \
     libbsd-devel \
     libcap-devel \
+    libcephfs-devel \
     libicu-devel \
     libnsl2-devel \
     libpcap-devel \
@@ -92,6 +95,7 @@ dnf -y -q --verbose install \
     redhat-lsb \
     rng-tools \
     rpcgen \
+    rpcsvc-proto-devel \
     rsync \
     sed \
     sudo \
@@ -99,6 +103,7 @@ dnf -y -q --verbose install \
     tar \
     tree \
     which \
+    xfsprogs-devel \
     yum-utils \
     zlib-devel
 

diff --git a/bootstrap/generated-dists/fedora28/packages.yml b/bootstrap/generated-dists/fedora28/packages.yml
index a37f78b33d2cc8b6c90f15547b8cd9c50cdd1453..8c81c565351aa4a96aed0b021b1a53a5d5274331 100644 (file)
--- a/bootstrap/generated-dists/fedora28/packages.yml
+++ b/bootstrap/generated-dists/fedora28/packages.yml
@@ -21,6 +21,8 @@ packages:
   - glib2-devel
   - glibc-common
   - glibc-langpack-en
+  - glusterfs-api-devel
+  - glusterfs-devel
   - gnutls-devel
   - gpgme-devel
   - gzip
@@ -37,6 +39,7 @@ packages:
   - libblkid-devel
   - libbsd-devel
   - libcap-devel
+  - libcephfs-devel
   - libicu-devel
   - libnsl2-devel
   - libpcap-devel
@@ -82,6 +85,7 @@ packages:
   - redhat-lsb
   - rng-tools
   - rpcgen
+  - rpcsvc-proto-devel
   - rsync
   - sed
   - sudo
@@ -89,5 +93,6 @@ packages:
   - tar
   - tree
   - which
+  - xfsprogs-devel
   - yum-utils
   - zlib-devel
\ No newline at end of file

diff --git a/bootstrap/generated-dists/fedora29/bootstrap.sh b/bootstrap/generated-dists/fedora29/bootstrap.sh
index 6793a37b8c9daeb931593c16ca530fad11bec99e..aa9d64c492af84699d469b91b65b9c9552d49e16 100755 (executable)
--- a/bootstrap/generated-dists/fedora29/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora29/bootstrap.sh
@@ -7,9 +7,9 @@
 
 set -xueo pipefail
 
-dnf -y -q update
+dnf update -y
 
-dnf -y -q --verbose install \
+dnf install -y \
     @development-tools \
     acl \
     attr \
@@ -31,6 +31,8 @@ dnf -y -q --verbose install \
     glib2-devel \
     glibc-common \
     glibc-langpack-en \
+    glusterfs-api-devel \
+    glusterfs-devel \
     gnutls-devel \
     gpgme-devel \
     gzip \
@@ -47,6 +49,7 @@ dnf -y -q --verbose install \
     libblkid-devel \
     libbsd-devel \
     libcap-devel \
+    libcephfs-devel \
     libicu-devel \
     libnsl2-devel \
     libpcap-devel \
@@ -92,6 +95,7 @@ dnf -y -q --verbose install \
     redhat-lsb \
     rng-tools \
     rpcgen \
+    rpcsvc-proto-devel \
     rsync \
     sed \
     sudo \
@@ -99,6 +103,7 @@ dnf -y -q --verbose install \
     tar \
     tree \
     which \
+    xfsprogs-devel \
     yum-utils \
     zlib-devel
 

diff --git a/bootstrap/generated-dists/fedora29/packages.yml b/bootstrap/generated-dists/fedora29/packages.yml
index a37f78b33d2cc8b6c90f15547b8cd9c50cdd1453..8c81c565351aa4a96aed0b021b1a53a5d5274331 100644 (file)
--- a/bootstrap/generated-dists/fedora29/packages.yml
+++ b/bootstrap/generated-dists/fedora29/packages.yml
@@ -21,6 +21,8 @@ packages:
   - glib2-devel
   - glibc-common
   - glibc-langpack-en
+  - glusterfs-api-devel
+  - glusterfs-devel
   - gnutls-devel
   - gpgme-devel
   - gzip
@@ -37,6 +39,7 @@ packages:
   - libblkid-devel
   - libbsd-devel
   - libcap-devel
+  - libcephfs-devel
   - libicu-devel
   - libnsl2-devel
   - libpcap-devel
@@ -82,6 +85,7 @@ packages:
   - redhat-lsb
   - rng-tools
   - rpcgen
+  - rpcsvc-proto-devel
   - rsync
   - sed
   - sudo
@@ -89,5 +93,6 @@ packages:
   - tar
   - tree
   - which
+  - xfsprogs-devel
   - yum-utils
   - zlib-devel
\ No newline at end of file

diff --git a/bootstrap/generated-dists/opensuse150/bootstrap.sh b/bootstrap/generated-dists/opensuse150/bootstrap.sh
index dbf7dabf55a248bd25f1e7373fc1b8660289fcc7..0d79288ef3f02f20a818dcf95e0cbbe4c12cc7f4 100755 (executable)
--- a/bootstrap/generated-dists/opensuse150/bootstrap.sh
+++ b/bootstrap/generated-dists/opensuse150/bootstrap.sh
@@ -29,6 +29,7 @@ zypper --non-interactive install \
     git \
     glib2-devel \
     glibc-locale \
+    glusterfs-devel \
     gnutls-devel \
     gpgme-devel \
     gzip \
@@ -44,6 +45,7 @@ zypper --non-interactive install \
     libblkid-devel \
     libbsd-devel \
     libcap-devel \
+    libcephfs-devel \
     libicu-devel \
     libjansson-devel \
     libnettle-devel \
@@ -87,6 +89,7 @@ zypper --non-interactive install \
     readline-devel \
     rng-tools \
     rpcgen \
+    rpcsvc-proto-devel \
     rsync \
     sed \
     sudo \
@@ -94,6 +97,7 @@ zypper --non-interactive install \
     tar \
     tree \
     which \
+    xfsprogs-devel \
     yum-utils \
     zlib-devel \
     system-user-nobody

diff --git a/bootstrap/generated-dists/opensuse150/packages.yml b/bootstrap/generated-dists/opensuse150/packages.yml
index a6c989ffebd573fb12ff6ff293045068d6a39107..ddf8cdb7ba644666b5c4afd2a82e20be0823fd2d 100644 (file)
--- a/bootstrap/generated-dists/opensuse150/packages.yml
+++ b/bootstrap/generated-dists/opensuse150/packages.yml
@@ -19,6 +19,7 @@ packages:
   - git
   - glib2-devel
   - glibc-locale
+  - glusterfs-devel
   - gnutls-devel
   - gpgme-devel
   - gzip
@@ -34,6 +35,7 @@ packages:
   - libblkid-devel
   - libbsd-devel
   - libcap-devel
+  - libcephfs-devel
   - libicu-devel
   - libjansson-devel
   - libnettle-devel
@@ -77,6 +79,7 @@ packages:
   - readline-devel
   - rng-tools
   - rpcgen
+  - rpcsvc-proto-devel
   - rsync
   - sed
   - sudo
@@ -84,5 +87,6 @@ packages:
   - tar
   - tree
   - which
+  - xfsprogs-devel
   - yum-utils
   - zlib-devel
\ No newline at end of file

diff --git a/bootstrap/generated-dists/ubuntu1404/bootstrap.sh b/bootstrap/generated-dists/ubuntu1404/bootstrap.sh
index 2c2b85402f032b9443661863df8dc853e26421e9..478d7c9a0d6f1e6f4879dfa73c3f023b290cac7e 100755 (executable)
--- a/bootstrap/generated-dists/ubuntu1404/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1404/bootstrap.sh
@@ -99,6 +99,7 @@ apt-get -y install \
     tar \
     tree \
     uuid-dev \
+    xfslibs-dev \
     xsltproc \
     zlib1g-dev
 

diff --git a/bootstrap/generated-dists/ubuntu1404/packages.yml b/bootstrap/generated-dists/ubuntu1404/packages.yml
index c526596bd47bb8a39441951626bc7830437006f6..b796d0d2d373b2cffa288b6bf9b2148788e79f85 100644 (file)
--- a/bootstrap/generated-dists/ubuntu1404/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1404/packages.yml
@@ -88,5 +88,6 @@ packages:
   - tar
   - tree
   - uuid-dev
+  - xfslibs-dev
   - xsltproc
   - zlib1g-dev
\ No newline at end of file

diff --git a/bootstrap/generated-dists/ubuntu1604/bootstrap.sh b/bootstrap/generated-dists/ubuntu1604/bootstrap.sh
index 441c78ca13b95d67e9b1ca2025d792999460ded3..43c66be224b451aca1622993e002eeaa7a65f43e 100755 (executable)
--- a/bootstrap/generated-dists/ubuntu1604/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1604/bootstrap.sh
@@ -100,6 +100,7 @@ apt-get -y install \
     tar \
     tree \
     uuid-dev \
+    xfslibs-dev \
     xsltproc \
     zlib1g-dev
 

diff --git a/bootstrap/generated-dists/ubuntu1604/packages.yml b/bootstrap/generated-dists/ubuntu1604/packages.yml
index eedc0a01e2bf6421adaf248f4223f9ee6cef4e3f..b9c4cb0308c10f541a0215460cf37ba26c699edd 100644 (file)
--- a/bootstrap/generated-dists/ubuntu1604/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1604/packages.yml
@@ -89,5 +89,6 @@ packages:
   - tar
   - tree
   - uuid-dev
+  - xfslibs-dev
   - xsltproc
   - zlib1g-dev
\ No newline at end of file

diff --git a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
index 8bed53400a41064565726013d20a226b81253ee8..0defc9325b6976ae0c8433a501165515fce52b7e 100755 (executable)
--- a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
@@ -28,6 +28,7 @@ apt-get -y install \
     gcc \
     gdb \
     git \
+    glusterfs-common \
     gzip \
     hostname \
     htop \
@@ -42,6 +43,7 @@ apt-get -y install \
     libblkid-dev \
     libbsd-dev \
     libcap-dev \
+    libcephfs-dev \
     libcups2-dev \
     libdbus-1-dev \
     libglib2.0-dev \
@@ -100,6 +102,7 @@ apt-get -y install \
     tar \
     tree \
     uuid-dev \
+    xfslibs-dev \
     xsltproc \
     zlib1g-dev
 

diff --git a/bootstrap/generated-dists/ubuntu1804/packages.yml b/bootstrap/generated-dists/ubuntu1804/packages.yml
index 0f4332688bf22e944b1d14106a6db4f501ba59bb..6b3c00910c86c30dea73528cf2acb298c2fdf4bb 100644 (file)
--- a/bootstrap/generated-dists/ubuntu1804/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1804/packages.yml
@@ -17,6 +17,7 @@ packages:
   - gcc
   - gdb
   - git
+  - glusterfs-common
   - gzip
   - hostname
   - htop
@@ -31,6 +32,7 @@ packages:
   - libblkid-dev
   - libbsd-dev
   - libcap-dev
+  - libcephfs-dev
   - libcups2-dev
   - libdbus-1-dev
   - libglib2.0-dev
@@ -89,5 +91,6 @@ packages:
   - tar
   - tree
   - uuid-dev
+  - xfslibs-dev
   - xsltproc
   - zlib1g-dev
\ No newline at end of file

diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index d7dbdaee0847bb4ab4ffccac96f86ed9d1b1d769..648f1cc97480fee4e485409322a4bee70e32c43c 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-5c2b831fb6aef8abd25dbdc6ade53ba2ebad1a1c
+735b9b509e6928bc71fe4442798e4fe110a98788