meta-openembedded: subtree update:290ad988fb..b315c1a024

Alex Kiernan (1):
      ostree: Add recipe

Bartosz Golaszewski (3):
      python3-ruamel-yaml: new package
      sshfs-fuse: upgrade 2.10 -> 3.5.2
      python3-dtschema: new package

Hongzhi.Song (1):
      numactl: fix a error about lib32-numactl

Jens Rehsack (1):
      libstatgrab: add recipe for libstatgrab-0.92

Leon Anavi (1):
      mosquitto: update to 1.6.6

Naveen Saini (1):
      rrdtool: suppress appending of installation to perllocal.pod

Oleksandr Kravchuk (1):
      jasper: update to 2.0.16

Peiran Hong (1):
      nmap: Update to 7.80

Randy MacLeod (1):
      rsyslog: update from 8.1907.0 to 8.1908.0

Vincent Prince (1):
      mongodb: bump to version 4.2.0+git18ce5c9

Yi Zhao (1):
      phpmyadmin: upgrade 4.9.0.1 -> 4.9.1

Zang Ruochen (5):
      python-alembic: upgrade 1.1.0 -> 1.2.0
      python-msgpack: upgrade 0.6.1 -> 0.6.2
      python-pysocks: upgrade 1.7.0 -> 1.7.1
      python-pytest: upgrade 5.1.2 -> 5.1.3
      python-urllib3: upgrade 1.25.3 -> 1.25.5

Change-Id: I247e7d6f6ce9fcba0f345e9f9e72cf9a52f98340
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.9.1.bb b/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.9.1.bb
new file mode 100644
index 0000000..3da2d9b
--- /dev/null
+++ b/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.9.1.bb
@@ -0,0 +1,41 @@
+SUMMARY = "Web-based MySQL administration interface"
+HOMEPAGE = "http://www.phpmyadmin.net"
+# Main code is GPLv2, vendor/tecnickcom/tcpdf is under LGPLv3, js/jquery is under MIT
+LICENSE = "GPLv2 & LGPLv3 & MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+                    file://vendor/tecnickcom/tcpdf/LICENSE.TXT;md5=dd6470bbcd3436ca317f82d34abaf688 \
+                    file://js/vendor/jquery/MIT-LICENSE.txt;md5=e43aa437a6a1ba421653bd5034333bf9 \
+"
+
+SRC_URI = "https://files.phpmyadmin.net/phpMyAdmin/${PV}/phpMyAdmin-${PV}-all-languages.tar.xz \
+           file://apache.conf \
+"
+
+SRC_URI[md5sum] = "a165109629731f5311ec3171cce50972"
+SRC_URI[sha256sum] = "8f89dd62e3fdddabca187b092eeb5af4a4fb956189564c56038970519d0496c5"
+
+UPSTREAM_CHECK_URI = "https://www.phpmyadmin.net/downloads/"
+UPSTREAM_CHECK_REGEX = "phpMyAdmin-(?P<pver>\d+(\.\d+)+)-all-languages.tar.xz"
+
+S = "${WORKDIR}/phpMyAdmin-${PV}-all-languages"
+
+inherit allarch
+
+do_install() {
+    install -d ${D}${datadir}/${BPN}
+    cp -R --no-dereference --preserve=mode,links -v * ${D}${datadir}/${BPN}
+    chown -R root:root ${D}${datadir}/${BPN}
+    # Don't install patches to target
+    rm -rf ${D}${datadir}/${BPN}/patches
+
+    install -d ${D}${sysconfdir}/apache2/conf.d
+    install -m 0644 ${WORKDIR}/apache.conf ${D}${sysconfdir}/apache2/conf.d/phpmyadmin.conf
+
+    # Remove a few scripts that explicitly require bash (!)
+    rm -f ${D}${datadir}/phpmyadmin/libraries/transformations/*.sh
+}
+
+FILES_${PN} = "${datadir}/${BPN} \
+               ${sysconfdir}/apache2/conf.d"
+
+RDEPENDS_${PN} += "bash php-cli"