meta-openembedded: subtree update:08c0280b7c..4fe1065655

Alexander Kanavin (1):
      libmicrohttpd: remove the recipe

Andreas Müller (4):
      jack: upgrade 1.19.17 -> 1.19.18
      xfce4-settings: upgrade 4.16.0 -> 4.16.1
      zsh: reduce priority slightly to avoid conflict with bash
      mutter/wayland: replace xserver-xorg-xwayland by xwayland in rdep

Andrej Kozemcak (1):
      proftpd: Update to 1.3.7a release

Armin Kuster (3):
      wireguard: update to v1.0.20210219 +1
      nostromo: remove recipe
      packagegroup-meta-webserver: remove nostromo from pkg grp

Chen Qi (3):
      tigervnc: upgrade to 1.11.0
      python3-django: upgrade to 2.2.20
      tigervnc: fix do_package error when enabling user merge

Gianfranco (1):
      vboxguestdrivers: upgrade 6.1.18 -> 6.1.20

Hongxu Jia (1):
      debootstrap: explicitly add virtual/fakeroot-native to depends

Joe Hershberger (1):
      strongswan: Make PACKAGECONFIG a default value

Justin Standring (1):
      tslib: add PACKAGECONFIG for evthres, one-wire-ts-input

Kai Kang (1):
      freeradius: check existence of openssl's commands in bootstrap

Khem Raj (36):
      nss: Re-enable -Werror
      gimp: Disable vector icon generation on mips/glibc too
      iwd: Upgade to 1.13
      python3-icu: Upgrade to 2.7.2
      nodejs: Update to 14.16.1
      nodejs: Fix build with icu-69
      nodejs: Use qemu usermode to run target binaries during build
      nodejs: Fix build on mips
      nodejs: Fix build with clang for x86 target
      tbb: Re-introduce PE
      bearssl: Update to tip of master
      gimp: Disable vector icons on musl/x86
      gd: Replace deprecated types from tiff
      nodejs: Enable snapshot
      python3-docutils: Delete
      libchamplain: Require opengl distro feature
      aom: Match the name for AOM-Patent-License-1.0
      libdevmapper,lvm2: Do not inherit license
      gnome-disk-utility: Require polkit in distro features
      README: Make git send-email example work
      sysprof: Enable sysprofd/libsysprof only when polkit in DISTRO_FEATURES
      packagegroup-gnome-apps: Add gnome-disk-utility only if polkit is in DISTRO_FEATURES
      python3-jinja2_2.%.bbappend: Delete
      python3-pyyaml: Do not check for meta-python
      python3-pyyaml: Delete
      python3-markupsafe: Delete bbappend
      snort,proftpd,net-snmp: Deal with -ffile-prefix-map as well
      apache2: Deal with -ffile-prefix-map
      vk-gl-cts: Fix build with GCC 11
      gegl: Update to 0.4.30
      python3-m2crypto: Upgrade to 0.37.1
      libupnp: Upgrade to 1.14.6
      ctags: Switch to universal ctags
      dibbler: Add libpthread to linker flags
      libowfat: Replace __pure__ with pure and remove using __deprecated__
      emacs: Do not use SIGSTKSZ

Leon Anavi (21):
      python3-bitarray: Upgrade 1.9.2 -> 2.0.0
      python3-xxhash: Upgrade 2.0.0 -> 2.0.2
      python3-xlsxwriter: Upgrade 1.3.8 -> 1.3.9
      python3-docutils: Upgrade 0.17 -> 0.17.1
      python3-portion: Upgrade 2.1.5 -> 2.1.6
      python3-huey: Upgrade 2.3.1 -> 2.3.2
      python3-pysonos: Upgrade 0.0.42 -> 0.0.43
      python3-asttokens: Upgrade 2.0.4 -> 2.0.5
      python3-hyperframe: Upgrade 6.0.0 -> 6.0.1
      python3-argcomplete: Upgrade 1.12.2 -> 1.12.3
      python3-python-vlc: Upgrade 3.0.12117 -> 3.0.12118
      python3-bitarray: Upgrade 2.0.0 -> 2.0.1
      python3-sqlalchemy: Upgrade 1.4.7 -> 1.4.11
      python3-watchdog: Upgrade 2.0.2 -> 2.0.3
      python3-pytest-asyncio: Upgrade 0.14.0 -> 0.15.1
      python3-xlsxwriter: Upgrade 1.3.9 -> 1.4.0
      python3-astroid: Upgrade 2.5.3 -> 2.5.6
      python3-arpeggio: Upgrade 1.10.1 -> 1.10.2
      python3-cachetools: Upgrade 4.2.1 -> 4.2.2
      python3-pymisp: Upgrade 2.4.141.1 -> 2.4.142
      python3-et-xmlfile: Upgrade 1.0.1 -> 1.1.0

Mingli Yu (4):
      python3-cryptography: Upgrade to 3.3.2
      onig: add oniguruma to PROVIDES
      php: Upgrade to 7.4.16
      tk: adapt to potential pseudo changes

Persian Prince (1):
      libdvdnav 6.1.1

Peter Kjellerstedt (1):
      syslog-ng: Merge .bb and .inc

Ramon Fried (1):
      bitwise: Upgrade 0.41 -> 0.42

Reto Schneider (1):
      nng: Upgrade 1.2.5 -> 1.4.0

Saul Wold (2):
      tbb: Disable PPC as COMPATIBLE_MACHINE
      packagegroup-meta-oe: conditional remove tbb for powerpc

Silcet (2):
      ufw: fix python shebang
      ufw: bump version to 0.36 and add services

Sinan Kaya (1):
      zram: add support for mem_limit

Stefan Ghinea (1):
      python3-django: fix CVE-2021-28658

Ulrich Ölmann (1):
      v4l-utils: fix reproducibility

Yi Fan Yu (3):
      syslog-ng: upgrade 3.24.1 -> 3.31.2
      syslog-ng: remove CONFIG_TLS override for arm DEBUG_BUILD
      syslog-ng: Drop an obsolete patch to add --enable-libnet

Yi Zhao (1):
      gvfs: rdepend on gsettings-desktop-schemas

zangrc (19):
      fuse3: upgrade 3.10.2 -> 3.10.3
      cifs-utils: upgrade 6.12 -> 6.13
      dnsmasq: upgrade 2.84 -> 2.85
      nbdkit: upgrade 1.25.5 -> 1.25.6
      wolfssl: upgrade 4.7.0 -> 4.7.1
      networkmanager: upgrade 1.30.2 -> 1.30.4
      libdvdread: upgrade 6.1.1 -> 6.1.2
      libwebsockets: upgrade 4.1.6 -> 4.2.0
      ostree: upgrade 2021.1 -> 2021.2
      redis: upgrade 6.2.1 -> 6.2.2
      tinyproxy: upgrade 1.10.0 -> 1.11.0
      nss: upgrade 3.63 -> 3.64
      babeld: upgrade 1.9.2 -> 1.10
      fetchmail: upgrade 6.4.18 -> 6.4.19
      openvpn: upgrade 2.5.1 -> 2.5.2
      wireshark: upgrade 3.4.4 -> 3.4.5
      debootstrap: upgrade 1.0.123 -> 1.0.124
      mailcap: upgrade 2.1.52 -> 2.1.53
      rsyslog: upgrade 8.2102.0 -> 8.2104.0

zhengruoqin (7):
      irssi: upgrade 1.2.2 -> 1.2.3
      librsync: upgrade 2.3.1 -> 2.3.2
      hiawatha: upgrade 10.11 -> 10.12
      python3-supervisor: upgrade 4.2.1 -> 4.2.2
      python3-zopeinterface: upgrade 5.3.0 -> 5.4.0
      sdparm: upgrade 1.11 -> 1.12
      tcsh: upgrade 6.22.03 -> 6.22.04

Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: Iaeb2fe4ee0a49cf44ea60bc3c1aef83528d92f55
diff --git a/meta-openembedded/meta-networking/recipes-daemons/proftpd/proftpd_1.3.7a.bb b/meta-openembedded/meta-networking/recipes-daemons/proftpd/proftpd_1.3.7a.bb
new file mode 100644
index 0000000..f2a89e5
--- /dev/null
+++ b/meta-openembedded/meta-networking/recipes-daemons/proftpd/proftpd_1.3.7a.bb
@@ -0,0 +1,145 @@
+SUMMARY = "Secure and configurable FTP server"
+SECTION = "net"
+HOMEPAGE = "http://www.proftpd.org"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fb0d1484d11915fa88a6a7702f1dc184"
+
+SRCREV = "715eadc1aa4f6b07d69f9d09558e9cb471e51d87"
+BRANCH = "1.3.7"
+
+SRC_URI = "git://github.com/proftpd/proftpd.git;branch=${BRANCH} \
+           file://basic.conf.patch \
+           file://proftpd-basic.init \
+           file://default \
+           file://close-RequireValidShell-check.patch \
+           file://contrib.patch  \
+           file://build_fixup.patch \
+           file://proftpd.service \
+           "
+
+S = "${WORKDIR}/git"
+
+inherit autotools-brokensep useradd update-rc.d systemd multilib_script
+
+PACKAGECONFIG ??= "shadow \
+                   ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 pam', d)} \
+                   static \
+                  "
+
+PACKAGECONFIG[curses] = "--enable-curses --enable-ncurses, --disable-curses --disable-ncurses, ncurses"
+PACKAGECONFIG[openssl] = "--enable-openssl, --disable-openssl, openssl, openssl"
+PACKAGECONFIG[pam] = "--enable-auth-pam, --disable-auth-pam, libpam, libpam"
+PACKAGECONFIG[ipv6] = "--enable-ipv6, --disable-ipv6"
+PACKAGECONFIG[shadow] = "--enable-shadow, --disable-shadow"
+PACKAGECONFIG[pcre] = "--enable-pcre, --disable-pcre, libpcre "
+PACKAGECONFIG[static] = "--enable-static=yes, --enable-static=no"
+
+# enable POSIX.1e capabilities
+PACKAGECONFIG[cap] = "--enable-cap, --disable-cap, libcap, libcap"
+
+#enable support for POSIX ACLs
+PACKAGECONFIG[acl] = "--enable-facl, --disable-facl"
+
+#enable proftpd controls via ftpdct
+PACKAGECONFIG[ctrls] = "--enable-ctrls, --disable-crtls"
+
+#prevent proftpd from using its bundled getopt implementation.
+PACKAGECONFIG[getopt] = "--with-getopt, --without-getopt"
+
+#do not strip debugging symbols from installed code
+PACKAGECONFIG[strip] = "--enable-strip, --disable-strip"
+
+#enable SIA authentication support (Tru64)
+PACKAGECONFIG[sia] = "--enable-sia, --disable-sia"
+PACKAGECONFIG[sendfile] = "-enable-sendfile, --disable-sendfile"
+
+#enable Native Language Support (NLS)
+PACKAGECONFIG[nls] = "--enable-nls, --disable-nls"
+
+#add mod_dso to core modules
+PACKAGECONFIG[dso] = "--enable-dso, --disable-dso"
+PACKAGECONFIG[largefile] = "--enable-largefile, --disable-largefile"
+
+#omit mod_auth_file from core modules
+PACKAGECONFIG[auth] = "--enable-auth-file, --disable-auth-file"
+
+# proftpd uses libltdl which currently makes configuring using
+# autotools.bbclass a pain...
+do_configure () {
+    install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}
+    install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}
+    oe_runconf
+}
+
+FTPUSER = "ftp"
+FTPGROUP = "ftp"
+
+do_install () {
+    oe_runmake DESTDIR=${D} install
+    rmdir ${D}${libdir}/proftpd ${D}${datadir}/locale
+    [ -d ${D}${libexecdir} ] && rmdir ${D}${libexecdir}
+    sed -i '/ *User[ \t]*/s/ftp/${FTPUSER}/' ${D}${sysconfdir}/proftpd.conf
+    sed -i '/ *Group[ \t]*/s/ftp/${FTPGROUP}/' ${D}${sysconfdir}/proftpd.conf
+    install -d ${D}${sysconfdir}/init.d
+    install -m 0755 ${WORKDIR}/proftpd-basic.init ${D}${sysconfdir}/init.d/proftpd
+    sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/proftpd
+    sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/proftpd
+    sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/proftpd
+    sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${sysconfdir}/init.d/proftpd
+
+    install -d ${D}${sysconfdir}/default
+    install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/proftpd
+
+    # create the pub directory
+    mkdir -p ${D}/home/${FTPUSER}/pub/
+    chown -R ${FTPUSER}:${FTPGROUP} ${D}/home/${FTPUSER}/pub
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then
+        # install proftpd pam configuration
+        install -d ${D}${sysconfdir}/pam.d
+        install -m 644 ${S}/contrib/dist/rpm/ftp.pamd ${D}${sysconfdir}/pam.d/proftpd
+        sed -i '/ftpusers/d' ${D}${sysconfdir}/pam.d/proftpd
+        # specify the user Authentication config
+        sed -i '/^MaxInstances/a\AuthPAM                         on\nAuthPAMConfig                   proftpd' \
+            ${D}${sysconfdir}/proftpd.conf
+    fi
+
+    install -d ${D}/${systemd_unitdir}/system
+    install -m 644 ${WORKDIR}/proftpd.service ${D}/${systemd_unitdir}/system
+    sed -e 's,@BASE_SBINDIR@,${base_sbindir},g' \
+        -e 's,@SYSCONFDIR@,${sysconfdir},g' \
+        -e 's,@SBINDIR@,${sbindir},g' \
+        -i ${D}${systemd_unitdir}/system/*.service
+
+    sed -e 's|--sysroot=${STAGING_DIR_HOST}||g' \
+        -e 's|${STAGING_DIR_NATIVE}||g' \
+        -e 's|-ffile-prefix-map=[^ ]*||g' \
+        -e 's|-fdebug-prefix-map=[^ ]*||g' \
+        -e 's|-fmacro-prefix-map=[^ ]*||g' \
+        -i ${D}/${bindir}/prxs
+
+    # ftpmail perl script, which reads the proftpd log file and sends
+    # automatic email notifications once an upload finishs,
+    # depends on an old perl Mail::Sendmail
+    # The Mail::Sendmail has not been maintained for almost 10 years
+    # Other distribution not ship with ftpmail, so do the same to
+    # avoid confusion about having it fails to run
+    rm -rf ${D}${bindir}/ftpmail
+    rm -rf ${D}${mandir}/man1/ftpmail.1
+}
+
+INITSCRIPT_NAME = "proftpd"
+INITSCRIPT_PARAM = "defaults 85 15"
+
+SYSTEMD_PACKAGES = "${PN}"
+SYSTEMD_SERVICE_${PN} = "proftpd.service"
+
+USERADD_PACKAGES = "${PN}"
+GROUPADD_PARAM_${PN} = "--system ${FTPGROUP}"
+USERADD_PARAM_${PN} = "--system -g ${FTPGROUP} --home-dir /var/lib/${FTPUSER} --no-create-home \
+                       --shell /bin/false ${FTPUSER}"
+
+MULTILIB_SCRIPTS = "${PN}:${bindir}/prxs"
+
+FILES_${PN} += "/home/${FTPUSER}"
+
+RDEPENDS_${PN} += "perl"