diff options
Diffstat (limited to 'meta-openembedded/meta-networking/recipes-daemons')
32 files changed, 246 insertions, 244 deletions
diff --git a/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp_0.7.4.bb b/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp_0.7.4.bb index 936fc723f..7661e9c48 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp_0.7.4.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp_0.7.4.bb @@ -21,13 +21,13 @@ PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers" PACKAGECONFIG[readline] = "--enable-libreadline,--disable-libreadline,readline" INITSCRIPT_PACKAGES = "${PN}d" -INITSCRIPT_NAME_${PN}d = "atftpd" -INITSCRIPT_PARAMS_${PN}d = "defaults 80" +INITSCRIPT_NAME:${PN}d = "atftpd" +INITSCRIPT_PARAMS:${PN}d = "defaults 80" EXTRA_OEMAKE = "CFLAGS='${CFLAGS} -std=gnu89'" -do_install_append() { +do_install:append() { install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/atftpd.init ${D}${sysconfdir}/init.d/atftpd @@ -41,16 +41,16 @@ do_install_append() { PACKAGES =+ "${PN}d" -FILES_${PN} = "${bindir}/*" +FILES:${PN} = "${bindir}/*" -FILES_${PN}d = "${sbindir}/* \ +FILES:${PN}d = "${sbindir}/* \ ${sysconfdir} \ /srv/tftp \ ${systemd_unitdir}/system/atftpd.service \ " SYSTEMD_PACKAGES = "${PN}d" -SYSTEMD_SERVICE_${PN}d = "atftpd.service" -RPROVIDES_${PN}d += "${PN}d-systemd" -RREPLACES_${PN}d += "${PN}d-systemd" -RCONFLICTS_${PN}d += "${PN}d-systemd" +SYSTEMD_SERVICE:${PN}d = "atftpd.service" +RPROVIDES:${PN}d += "${PN}d-systemd" +RREPLACES:${PN}d += "${PN}d-systemd" +RCONFLICTS:${PN}d += "${PN}d-systemd" diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-if-undefined.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-if-undefined.patch index 117b1e58a..f16ae5277 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-if-undefined.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-if-undefined.patch @@ -13,8 +13,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> lib/log.c | 6 +++++- 3 files changed, 24 insertions(+), 7 deletions(-) -diff --git a/daemon/automount.c b/daemon/automount.c -index e476f6b..3a1514b 100644 --- a/daemon/automount.c +++ b/daemon/automount.c @@ -1,7 +1,7 @@ @@ -50,7 +48,7 @@ index e476f6b..3a1514b 100644 #include "automount.h" #if defined(LIBXML2_WORKAROUND) || defined(TIRPC_WORKAROUND) #include <dlfcn.h> -@@ -282,7 +290,7 @@ int rmdir_path(struct autofs_point *ap, const char *path, dev_t dev) +@@ -282,7 +290,7 @@ int rmdir_path(struct autofs_point *ap, dev, buf, st.st_dev); return -1; } @@ -59,7 +57,7 @@ index e476f6b..3a1514b 100644 /* * Last element of path may be a symbolic link; all others * are directories (and the last directory element is -@@ -455,7 +463,7 @@ int count_mounts(struct autofs_point *ap, const char *path, dev_t dev) +@@ -455,7 +463,7 @@ int count_mounts(struct autofs_point *ap counter.count = 0; counter.dev = dev; @@ -68,7 +66,7 @@ index e476f6b..3a1514b 100644 if (walk_tree(path, counter_fn, 1, ap, &counter) == -1) return -1; -@@ -811,7 +819,7 @@ static char *automount_path_to_fifo(unsigned logopt, const char *path) +@@ -811,7 +819,7 @@ static char *automount_path_to_fifo(unsi /* * An automount path can be made up of subdirectories. So, to * create the fifo name, we will just replace instances of '/' with @@ -77,7 +75,7 @@ index e476f6b..3a1514b 100644 */ p = fifo_name + strlen(fifodir); while (*p != '\0') { -@@ -1640,7 +1648,7 @@ static void return_start_status(void *arg) +@@ -1640,7 +1648,7 @@ static void return_start_status(void *ar sc->done = 1; /* @@ -86,8 +84,6 @@ index e476f6b..3a1514b 100644 * the startup process. */ status = pthread_cond_signal(&sc->cond); -diff --git a/include/hash.h b/include/hash.h -index 2447f29..6f0dee6 100644 --- a/include/hash.h +++ b/include/hash.h @@ -5,6 +5,11 @@ @@ -102,11 +98,9 @@ index 2447f29..6f0dee6 100644 /* * The "GOLDEN_RATIO_PRIME" is used in ifs/btrfs/brtfs_inode.h and -diff --git a/lib/log.c b/lib/log.c -index 0cb47d7..39b1e3b 100644 --- a/lib/log.c +++ b/lib/log.c -@@ -38,7 +38,11 @@ static char *prepare_attempt_prefix(const char *msg) +@@ -38,7 +38,11 @@ static char *prepare_attempt_prefix(cons char buffer[ATTEMPT_ID_SIZE + 1]; char *prefixed_msg = NULL; @@ -119,6 +113,3 @@ index 0cb47d7..39b1e3b 100644 if (attempt_id) { int len = sizeof(buffer) + 1 + strlen(msg) + 1; --- -2.32.0 - diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/autofs-5.1.7-use-default-stack-size-for-threads.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/autofs-5.1.7-use-default-stack-size-for-threads.patch new file mode 100644 index 000000000..b21e7c03b --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/autofs-5.1.7-use-default-stack-size-for-threads.patch @@ -0,0 +1,110 @@ +autofs-5.1.7 - use default stack size for threads + +From: Ian Kent <raven@themaw.net> + +autofs uses PTHREAD_STACK_MIN to set the stack size for threads it +creates. + +In two cases it is used to reduce the stack size for long running +service threads while it's used to allocate a larger stack for worker +threads that can have larger memory requirements. + +In recent glibc releases PTHREAD_STACK_MIN is no longer a constant +which can lead to unexpectedly different stack sizes on different +architectures and the autofs assumption it's a constant causes a +compile failure. + +The need to alter the stack size was due to observed stack overflow +which was thought to be due the thread stack being too small for autofs +and glibc alloca(3) usage. + +Quite a bit of that alloca(3) usage has been eliminated from autofs now, +particularly those that might be allocating largish amounts of storage, +and there has been a lot of change in glibc too so using the thread +default stack should be ok. + +Signed-off-by: Ian Kent <raven@themaw.net> +--- + CHANGELOG | 1 + + daemon/automount.c | 29 ----------------------------- + daemon/state.c | 6 +----- + lib/alarm.c | 6 +----- + 4 files changed, 3 insertions(+), 39 deletions(-) + +--- a/daemon/automount.c ++++ b/daemon/automount.c +@@ -92,7 +92,6 @@ static size_t kpkt_len; + /* Attributes for creating detached and joinable threads */ + pthread_attr_t th_attr; + pthread_attr_t th_attr_detached; +-size_t detached_thread_stack_size = PTHREAD_STACK_MIN * 144; + + struct master_readmap_cond mrc = { + PTHREAD_MUTEX_INITIALIZER, PTHREAD_COND_INITIALIZER, 0, NULL, 0, 0, 0, 0}; +@@ -2617,34 +2616,6 @@ int main(int argc, char *argv[]) + if (start_pipefd[1] != -1) { + res = write(start_pipefd[1], pst_stat, sizeof(*pst_stat)); + close(start_pipefd[1]); +- } +- release_flag_file(); +- macro_free_global_table(); +- exit(1); +- } +- +-#ifdef _POSIX_THREAD_ATTR_STACKSIZE +- if (pthread_attr_setstacksize( +- &th_attr_detached, detached_thread_stack_size)) { +- logerr("%s: failed to set stack size thread attribute!", +- program); +- if (start_pipefd[1] != -1) { +- res = write(start_pipefd[1], pst_stat, sizeof(*pst_stat)); +- close(start_pipefd[1]); +- } +- release_flag_file(); +- macro_free_global_table(); +- exit(1); +- } +-#endif +- +- if (pthread_attr_getstacksize( +- &th_attr_detached, &detached_thread_stack_size)) { +- logerr("%s: failed to get detached thread stack size!", +- program); +- if (start_pipefd[1] != -1) { +- res = write(start_pipefd[1], pst_stat, sizeof(*pst_stat)); +- close(start_pipefd[1]); + } + release_flag_file(); + macro_free_global_table(); +--- a/daemon/state.c ++++ b/daemon/state.c +@@ -1173,12 +1173,8 @@ int st_start_handler(void) + status = pthread_attr_init(pattrs); + if (status) + pattrs = NULL; +- else { ++ else + pthread_attr_setdetachstate(pattrs, PTHREAD_CREATE_DETACHED); +-#ifdef _POSIX_THREAD_ATTR_STACKSIZE +- pthread_attr_setstacksize(pattrs, PTHREAD_STACK_MIN*4); +-#endif +- } + + status = pthread_create(&thid, pattrs, st_queue_handler, NULL); + +--- a/lib/alarm.c ++++ b/lib/alarm.c +@@ -270,12 +270,8 @@ int alarm_start_handler(void) + status = pthread_attr_init(pattrs); + if (status) + pattrs = NULL; +- else { ++ else + pthread_attr_setdetachstate(pattrs, PTHREAD_CREATE_DETACHED); +-#ifdef _POSIX_THREAD_ATTR_STACKSIZE +- pthread_attr_setstacksize(pattrs, PTHREAD_STACK_MIN*4); +-#endif +- } + + status = pthread_condattr_init(&condattrs); + if (status) diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.7.bb b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.7.bb index 019b453c2..3fc574fd0 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.7.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.7.bb @@ -26,6 +26,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/autofs-${PV}.tar.gz \ file://0001-Do-not-hardcode-path-for-pkg.m4.patch \ file://0001-Bug-fix-for-pid_t-not-found-on-musl.patch \ file://0001-Define-__SWORD_TYPE-if-undefined.patch \ + file://autofs-5.1.7-use-default-stack-size-for-threads.patch \ " SRC_URI[sha256sum] = "a18619e5ad18960fe382354eef33f070e57e4e5711d484b010acde080a003312" @@ -59,14 +60,14 @@ CACHED_CONFIGUREVARS = "ac_cv_path_RANLIB=${RANLIB} \ piddir=/run \ " -do_configure_prepend () { +do_configure:prepend () { if [ ! -e ${S}/acinclude.m4 ]; then cp ${S}/aclocal.m4 ${S}/acinclude.m4 fi cp ${STAGING_DATADIR_NATIVE}/aclocal/pkg.m4 . } -do_install_append () { +do_install:append () { # samples have been removed from SUBDIRS from 5.1.5, need to install separately oe_runmake 'DESTDIR=${D}' install_samples @@ -89,9 +90,9 @@ SOLIBS = ".so" FILES_SOLIBSDEV = "" # Some symlinks are created in plugins dir e.g. # mount_nfs4.so -> mount_nfs.so -INSANE_SKIP_${PN} = "dev-so" +INSANE_SKIP:${PN} = "dev-so" -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "autofs.service" +RPROVIDES:${PN} += "${PN}-systemd" +RREPLACES:${PN} += "${PN}-systemd" +RCONFLICTS:${PN} += "${PN}-systemd" +SYSTEMD_SERVICE:${PN} = "autofs.service" diff --git a/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb index c4b41ace8..46aeb23a3 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb @@ -41,7 +41,7 @@ PACKAGECONFIG[ntlm] = "--enable-ntlm=yes,--enable-ntlm=no,," CFLAGS += "-fPIC" -do_configure_prepend () { +do_configure:prepend () { # make it be able to work with db 5.0 version local sed_files="sasldb/db_berkeley.c utils/dbconverter-2.c" for sed_file in $sed_files; do @@ -49,14 +49,14 @@ do_configure_prepend () { done } -do_compile_prepend () { +do_compile:prepend () { cd include ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} ${S}/include/makemd5.c -o makemd5 touch makemd5.o makemd5.lo makemd5 cd .. } -do_install_append() { +do_install:append() { if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d ${D}${systemd_unitdir}/system install -m 0644 ${WORKDIR}/saslauthd.service ${D}${systemd_unitdir}/system @@ -75,10 +75,10 @@ do_install_append() { } USERADD_PACKAGES = "${PN}-bin" -USERADD_PARAM_${PN}-bin = "--system --home=/var/spool/mail -g mail cyrus" +USERADD_PARAM:${PN}-bin = "--system --home=/var/spool/mail -g mail cyrus" SYSTEMD_PACKAGES = "${PN}-bin" -SYSTEMD_SERVICE_${PN}-bin = "saslauthd.service" +SYSTEMD_SERVICE:${PN}-bin = "saslauthd.service" SYSTEMD_AUTO_ENABLE = "disable" SRC_URI[md5sum] = "a7f4e5e559a0e37b3ffc438c9456e425" @@ -86,16 +86,16 @@ SRC_URI[sha256sum] = "8fbc5136512b59bb793657f36fadda6359cae3b08f01fd16b3d406f134 PACKAGES =+ "${PN}-bin" -FILES_${PN} += "${libdir}/sasl2/*.so*" -FILES_${PN}-bin += "${bindir} \ +FILES:${PN} += "${libdir}/sasl2/*.so*" +FILES:${PN}-bin += "${bindir} \ ${sysconfdir}/default/saslauthd \ ${systemd_unitdir}/system/saslauthd.service \ ${sysconfdir}/tmpfiles.d/saslauthd.conf" -FILES_${PN}-dev += "${libdir}/sasl2/*.la" -FILES_${PN}-dbg += "${libdir}/sasl2/.debug" -FILES_${PN}-staticdev += "${libdir}/sasl2/*.a" +FILES:${PN}-dev += "${libdir}/sasl2/*.la" +FILES:${PN}-dbg += "${libdir}/sasl2/.debug" +FILES:${PN}-staticdev += "${libdir}/sasl2/*.a" -INSANE_SKIP_${PN} += "dev-so" +INSANE_SKIP:${PN} += "dev-so" # CVE-2020-8032 affects only openSUSE CVE_CHECK_WHITELIST += "CVE-2020-8032" diff --git a/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool_1.3.bb b/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool_1.3.bb index 3554e688a..19fbd0fa2 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool_1.3.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool_1.3.bb @@ -36,7 +36,7 @@ SRC_URI[sha256sum] = "d3eab7d6cad5da8ccc9d1e31d5303e27a39622c07bdb8fa3618eea3144 inherit systemd DEPENDS = "readline ppp ncurses gzip-native rpcsvc-proto-native libtirpc" -RDEPENDS_${PN} = "rpcbind" +RDEPENDS:${PN} = "rpcbind" EXTRA_OEMAKE = "CC='${CC}' AS='${AS}' LD='${LD}' AR='${AR}' NM='${NM}' STRIP='${STRIP}'" EXTRA_OEMAKE += "PPPD_VERSION=${PPPD_VERSION} SYS_LIBDIR=${libdir}" @@ -45,11 +45,11 @@ EXTRA_OEMAKE += "IPPOOL_TEST=y" CPPFLAGS += "${SELECTED_OPTIMIZATION} -I${STAGING_INCDIR}/tirpc" -SYSTEMD_SERVICE_${PN} = "ippool.service" +SYSTEMD_SERVICE:${PN} = "ippool.service" SYSTEMD_AUTO_ENABLE = "disable" -do_compile_prepend() { +do_compile:prepend() { # fix the CFLAGS= and CPPFLAGS= in main Makefile, to have the extra CFLAGS in env sed -i -e "s/^CFLAGS=/CFLAGS+=/" ${S}/Makefile sed -i -e "s/^CPPFLAGS=/CPPFLAGS+=/" ${S}/Makefile @@ -79,12 +79,12 @@ do_install() { PACKAGES =+ "${PN}-test" -FILES_${PN} += "${libdir}/pppd/${PPPD_VERSION}/ippool.so" -FILES_${PN}-dbg += "${libdir}/pppd/${PPPD_VERSION}/.debug/ippool.so" -FILES_${PN}-test = "/opt/${BPN}" +FILES:${PN} += "${libdir}/pppd/${PPPD_VERSION}/ippool.so" +FILES:${PN}-dbg += "${libdir}/pppd/${PPPD_VERSION}/.debug/ippool.so" +FILES:${PN}-test = "/opt/${BPN}" # needs tcl to run tests -RDEPENDS_${PN}-test += "tcl ${BPN}" +RDEPENDS:${PN}-test += "tcl ${BPN}" PPPD_VERSION="${@get_ppp_version(d)}" diff --git a/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.4.bb b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.4.bb index 8a3dd011e..8e0da23b6 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.4.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.4.bb @@ -100,7 +100,7 @@ do_install () { fi } -pkg_postinst_${PN}() { +pkg_postinst:${PN}() { if [ "x$D" = "x" ]; then if [ -e /etc/init.d/populate-volatile.sh ]; then /etc/init.d/populate-volatile.sh update @@ -114,4 +114,4 @@ SYSTEMD_SERVICE = " iscsi-initiator.service iscsi-initiator-targets.service " INITSCRIPT_NAME = "iscsid" INITSCRIPT_PARAMS = "start 30 1 2 3 4 5 . stop 70 0 1 2 3 4 5 6 ." -FILES_${PN} += "${nonarch_libdir}/iscsi" +FILES:${PN} += "${nonarch_libdir}/iscsi" diff --git a/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_2.2.2.bb b/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_2.2.2.bb index f0cbca1be..d04b73876 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_2.2.2.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_2.2.2.bb @@ -29,7 +29,7 @@ PACKAGECONFIG[systemd] = "--with-init=systemd --with-systemdsystemunitdir=${syst EXTRA_OEMAKE = "initdir=${sysconfdir}/init.d" -do_install_append() { +do_install:append() { if [ -f ${D}${sysconfdir}/init.d/${BPN} ]; then chmod 0755 ${D}${sysconfdir}/init.d/${BPN} sed -i 's#rc.d/##' ${D}${sysconfdir}/init.d/${BPN} @@ -40,7 +40,7 @@ do_install_append() { fi } -FILES_${PN} += "${datadir}/snmp/mibs/KEEPALIVED-MIB.txt" +FILES:${PN} += "${datadir}/snmp/mibs/KEEPALIVED-MIB.txt" -SYSTEMD_SERVICE_${PN} = "keepalived.service" +SYSTEMD_SERVICE:${PN} = "keepalived.service" SYSTEMD_AUTO_ENABLE ?= "disable" diff --git a/meta-openembedded/meta-networking/recipes-daemons/lldpd/lldpd_1.0.8.bb b/meta-openembedded/meta-networking/recipes-daemons/lldpd/lldpd_1.0.8.bb index bd94c0919..cf2b156fe 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/lldpd/lldpd_1.0.8.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/lldpd/lldpd_1.0.8.bb @@ -17,8 +17,8 @@ SRC_URI[sha256sum] = "98d200e76e30f6262c4a4493148c1840827898329146a57a34f8f0f928 inherit autotools update-rc.d useradd systemd pkgconfig bash-completion USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system -g lldpd --shell /bin/false lldpd" -GROUPADD_PARAM_${PN} = "--system lldpd" +USERADD_PARAM:${PN} = "--system -g lldpd --shell /bin/false lldpd" +GROUPADD_PARAM:${PN} = "--system lldpd" EXTRA_OECONF += "--without-embedded-libevent \ --disable-oldies \ @@ -45,9 +45,9 @@ PACKAGECONFIG[custom] = "--enable-custom,--disable-custom" INITSCRIPT_NAME = "lldpd" INITSCRIPT_PARAMS = "defaults" -SYSTEMD_SERVICE_${PN} = "lldpd.service" +SYSTEMD_SERVICE:${PN} = "lldpd.service" -do_install_append() { +do_install:append() { install -Dm 0755 ${WORKDIR}/lldpd.init.d ${D}${sysconfdir}/init.d/lldpd install -Dm 0644 ${WORKDIR}/lldpd.default ${D}${sysconfdir}/default/lldpd # Make an empty configuration file @@ -56,9 +56,9 @@ do_install_append() { PACKAGES =+ "${PN}-zsh-completion" -FILES_${PN} += "${libdir}/sysusers.d" -RDEPENDS_${PN} += "os-release" +FILES:${PN} += "${libdir}/sysusers.d" +RDEPENDS:${PN} += "os-release" -FILES_${PN}-zsh-completion += "${datadir}/zsh/" +FILES:${PN}-zsh-completion += "${datadir}/zsh/" # FIXME: zsh is broken in meta-oe so this cannot be enabled for now -#RDEPENDS_${PN}-zsh-completion += "zsh" +#RDEPENDS:${PN}-zsh-completion += "zsh" diff --git a/meta-openembedded/meta-networking/recipes-daemons/ncftp/ncftp_3.2.6.bb b/meta-openembedded/meta-networking/recipes-daemons/ncftp/ncftp_3.2.6.bb index ee6da5737..592f98f9d 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/ncftp/ncftp_3.2.6.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/ncftp/ncftp_3.2.6.bb @@ -21,7 +21,7 @@ PACKAGECONFIG ??= "" PACKAGECONFIG[ccdv] = "--enable-ccdv,--disable-ccdv,," EXTRA_OECONF = "--disable-precomp" -TARGET_CC_ARCH_append = " ${SELECTED_OPTIMIZATION}" +TARGET_CC_ARCH:append = " ${SELECTED_OPTIMIZATION}" do_configure() { install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} diff --git a/meta-openembedded/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.1.bb b/meta-openembedded/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.1.bb index a697e983f..5159cf51e 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.1.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.1.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d" inherit features_check systemd -RDEPENDS_${PN} = "python3-pygobject python3-dbus" +RDEPENDS:${PN} = "python3-pygobject python3-dbus" REQUIRED_DISTRO_FEATURES = "systemd" SRCREV = "30e278e50749a60a930ceaa0971207c6436b8a0c" @@ -18,7 +18,7 @@ SRC_URI = "git://gitlab.com/craftyguy/networkd-dispatcher;protocol=https;nobranc S = "${WORKDIR}/git" SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "networkd-dispatcher.service" +SYSTEMD_SERVICE:${PN} = "networkd-dispatcher.service" SYSTEMD_AUTO_ENABLE = "disable" # Nothing to build, just a python script to install diff --git a/meta-openembedded/meta-networking/recipes-daemons/openhpi/openhpi_3.8.0.bb b/meta-openembedded/meta-networking/recipes-daemons/openhpi/openhpi_3.8.0.bb index e8d19a2c0..bacf984e7 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/openhpi/openhpi_3.8.0.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/openhpi/openhpi_3.8.0.bb @@ -55,10 +55,10 @@ inherit autotools pkgconfig ptest update-rc.d systemd PACKAGES =+ "${PN}-libs" -FILES_${PN}-libs = "${libdir}/${BPN}/*.so /usr/lib/${BPN}/*.so" +FILES:${PN}-libs = "${libdir}/${BPN}/*.so /usr/lib/${BPN}/*.so" -INSANE_SKIP_${PN}-libs = "dev-so" -RDEPENDS_${PN} += "${PN}-libs" +INSANE_SKIP:${PN}-libs = "dev-so" +RDEPENDS:${PN} += "${PN}-libs" PACKAGECONFIG ??= "libgcrypt non32bit snmp-bc" PACKAGECONFIG[sysfs] = "--enable-sysfs,--disable-sysfs,sysfsutils," @@ -68,7 +68,7 @@ PACKAGECONFIG[snmp-bc] = "--enable-snmp_bc,--disable-snmp_bc" export DISTRO -do_install_append () { +do_install:append () { install -m 0755 -d ${D}${sysconfdir}/${BPN} install -m 0644 ${S}/openhpiclient.conf.example ${D}${sysconfdir}/${BPN}/openhpiclient.conf install -m 0600 ${S}/openhpi.conf.example ${D}${sysconfdir}/${BPN}/openhpi.conf @@ -134,5 +134,5 @@ do_install_ptest () { INITSCRIPT_NAME = "openhpid" INITSCRIPT_PARAMS = "start 30 . stop 70 0 1 2 3 4 5 6 ." -SYSTEMD_SERVICE_${PN} = "openhpid.service" +SYSTEMD_SERVICE:${PN} = "openhpid.service" SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.21.06.bb b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.21.06.bb index a97167720..caa85e040 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.21.06.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.21.06.bb @@ -37,10 +37,10 @@ UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/opensaf/files/releases" inherit autotools useradd systemd pkgconfig USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "-f -r opensaf" -USERADD_PARAM_${PN} = "-r -g opensaf -d ${datadir}/opensaf/ -s ${sbindir}/nologin -c \"OpenSAF\" opensaf" +GROUPADD_PARAM:${PN} = "-f -r opensaf" +USERADD_PARAM:${PN} = "-r -g opensaf -d ${datadir}/opensaf/ -s ${sbindir}/nologin -c \"OpenSAF\" opensaf" -SYSTEMD_SERVICE_${PN} += "opensafd.service" +SYSTEMD_SERVICE:${PN} += "opensafd.service" SYSTEMD_AUTO_ENABLE = "disable" PACKAGECONFIG[systemd] = ",,systemd" @@ -53,7 +53,7 @@ CPPFLAGS += "-Wno-error=stringop-overflow= -Wno-error=stringop-truncation" CXXFLAGS += "-Wno-error=stringop-overflow= -Wno-error=stringop-truncation -Wno-error=format-truncation=" LDFLAGS += "-Wl,--as-needed -latomic -Wl,--no-as-needed" -do_install_append() { +do_install:append() { rm -fr "${D}${localstatedir}/lock" rm -fr "${D}${localstatedir}/run" rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" @@ -64,15 +64,15 @@ do_install_append() { fi } -FILES_${PN} += "${libdir}/libSa*.so ${systemd_unitdir}/system/*.service" -FILES_${PN}-dev += "${libdir}/libopensaf_core.so" -FILES_${PN}-staticdev += "${PKGLIBDIR}/*.a" +FILES:${PN} += "${libdir}/libSa*.so ${systemd_unitdir}/system/*.service" +FILES:${PN}-dev += "${libdir}/libopensaf_core.so" +FILES:${PN}-staticdev += "${PKGLIBDIR}/*.a" -INSANE_SKIP_${PN} = "dev-so" +INSANE_SKIP:${PN} = "dev-so" -RDEPENDS_${PN} += "bash python3-core" +RDEPENDS:${PN} += "bash python3-core" # http://errors.yoctoproject.org/Errors/Details/186970/ -COMPATIBLE_HOST_libc-musl = 'null' +COMPATIBLE_HOST:libc-musl = 'null' FILES_SOLIBSDEV = "" diff --git a/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix.inc b/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix.inc index 4b9940cc7..7bf258374 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix.inc +++ b/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix.inc @@ -25,11 +25,11 @@ inherit update-rc.d useradd update-alternatives systemd lib_package INITSCRIPT_NAME = "postfix" INITSCRIPT_PARAMS = "start 58 3 4 5 . stop 13 0 1 6 ." USERADD_PACKAGES = "${PN}-bin" -USERADD_PARAM_${PN}-bin = \ +USERADD_PARAM:${PN}-bin = \ "-d /var/spool/postfix -r -g postfix --shell /bin/false postfix; \ -d /var/spool/vmail -r -g vmail --shell /bin/false vmail \ " -GROUPADD_PARAM_${PN}-bin = "--system postfix;--system postdrop;--system vmail" +GROUPADD_PARAM:${PN}-bin = "--system postfix;--system postdrop;--system vmail" export SYSLIBS = "${LDFLAGS}" @@ -45,10 +45,10 @@ export AUXLIBS-ldap = "\ ${@bb.utils.contains('DISTRO_FEATURES', 'ldap', '-lldap -llber', '', d)}" # no native openldap -export CCARGS-ldap_class-native = "" -export AUXLIBS-ldap_class-native = "" +export CCARGS-ldap:class-native = "" +export AUXLIBS-ldap:class-native = "" -export CCARGS-nonis_libc-musl = "-DNO_NIS" +export CCARGS-nonis:libc-musl = "-DNO_NIS" export CCARGS-nonis = "" # SASL support -DUSE_LDAP_SASL -DUSE_SASL_AUTH @@ -57,8 +57,8 @@ export CCARGS-sasl = "\ ${@bb.utils.contains('DISTRO_FEATURES', 'sasl', '-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I${STAGING_INCDIR}/sasl', '', d)}" export AUXLIBS-sasl = "\ ${@bb.utils.contains('DISTRO_FEATURES', 'sasl', '-lsasl2', '', d)}" -export CCARGS-sasl_class-native = "" -export AUXLIBS-sasl_class-native = "" +export CCARGS-sasl:class-native = "" +export AUXLIBS-sasl:class-native = "" # PCRE, TLS support default export CCARGS = "${CFLAGS} -DHAS_PCRE -DUSE_TLS -I${STAGING_INCDIR}/openssl ${CCARGS-ldap} ${CCARGS-sasl} ${CCARGS-nonis}" @@ -95,11 +95,11 @@ do_compile () { oe_runmake } -do_install_prepend_class-native() { +do_install:prepend:class-native() { export POSTCONF="bin/postconf" } -SYSTEMD_SERVICE_${PN} = "postfix.service" +SYSTEMD_SERVICE:${PN} = "postfix.service" do_install () { sh ./postfix-install 'install_root=${D}' \ @@ -180,14 +180,14 @@ do_install () { rm -rf ${D}/etc/postfix/makedefs.out } -do_install_append_class-native() { +do_install:append:class-native() { ln -sf ../sbin/sendmail.postfix ${D}${bindir}/newaliases ln -sf ../sbin/sendmail.postfix ${D}${bindir}/mailq } -ALTERNATIVE_${PN}-bin = "sendmail mailq newaliases" +ALTERNATIVE:${PN}-bin = "sendmail mailq newaliases" # /usr/lib/sendmial is required by LSB core test -ALTERNATIVE_${PN}-bin_linuxstdbase = "sendmail mailq newaliases usr-lib-sendmail" +ALTERNATIVE:${PN}-bin:linuxstdbase = "sendmail mailq newaliases usr-lib-sendmail" ALTERNATIVE_TARGET[mailq] = "${bindir}/mailq" ALTERNATIVE_TARGET[newaliases] = "${bindir}/newaliases" ALTERNATIVE_TARGET[sendmail] = "${sbindir}/sendmail.postfix" @@ -197,12 +197,12 @@ ALTERNATIVE_LINK_NAME[usr-lib-sendmail] = "/usr/lib/sendmail" ALTERNATIVE_PRIORITY = "120" -ALTERNATIVE_${PN}-doc += "mailq.1 newaliases.1 sendmail.1" +ALTERNATIVE:${PN}-doc += "mailq.1 newaliases.1 sendmail.1" ALTERNATIVE_LINK_NAME[mailq.1] = "${mandir}/man1/mailq.1" ALTERNATIVE_LINK_NAME[newaliases.1] = "${mandir}/man1/newaliases.1" ALTERNATIVE_LINK_NAME[sendmail.1] = "${mandir}/man1/sendmail.1" -pkg_postinst_ontarget_${PN}-cfg () { +pkg_postinst_ontarget:${PN}-cfg () { touch /etc/aliases newaliases @@ -212,11 +212,11 @@ pkg_postinst_ontarget_${PN}-cfg () { } PACKAGES =+ "${PN}-cfg" -RDEPENDS_${PN}-cfg_class-target += "${PN}-bin" -RDEPENDS_${PN}_class-target += "${PN}-cfg" +RDEPENDS:${PN}-cfg:class-target += "${PN}-bin" +RDEPENDS:${PN}:class-target += "${PN}-cfg" # Exclude .debug directories from the main package -FILES_${PN}-bin += "${localstatedir} ${bindir}/* ${sbindir}/* \ +FILES:${PN}-bin += "${localstatedir} ${bindir}/* ${sbindir}/* \ ${libexecdir}/* ${systemd_unitdir}/*" -FILES_${PN}-cfg = "${sysconfdir}" -FILES_${PN}-dbg += "${libexecdir}/postfix/.debug" -ALLOW_EMPTY_${PN} = "1" +FILES:${PN}-cfg = "${sysconfdir}" +FILES:${PN}-dbg += "${libexecdir}/postfix/.debug" +ALLOW_EMPTY:${PN} = "1" diff --git a/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix_3.6.1.bb b/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix_3.6.2.bb index c139f0661..982544d5c 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix_3.6.1.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix_3.6.2.bb @@ -15,5 +15,5 @@ SRC_URI += "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-${P file://0001-makedefs-add-lnsl-and-lresolv-to-SYSLIBS-by-default.patch \ file://0007-correct-signature-of-closefrom-API.patch \ " -SRC_URI[sha256sum] = "20a805625601e7b95989220832c8fa14ce374f0711da054188f8cec6a92fd71c" -UPSTREAM_CHECK_REGEX = "postfix\-(?P<pver>3\.3(\.\d+)+).tar.gz" +SRC_URI[sha256sum] = "507323d20d7b3f705f49cf8c07d437c6d8090bed07e15a3c0ec405edad54a7d4" +UPSTREAM_CHECK_REGEX = "postfix\-(?P<pver>3\.6(\.\d+)+).tar.gz" 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 index f2a89e5a2..981757b56 100644 --- 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 @@ -131,15 +131,15 @@ INITSCRIPT_NAME = "proftpd" INITSCRIPT_PARAM = "defaults 85 15" SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "proftpd.service" +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 \ +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}" +FILES:${PN} += "/home/${FTPUSER}" -RDEPENDS_${PN} += "perl" +RDEPENDS:${PN} += "perl" diff --git a/meta-openembedded/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb b/meta-openembedded/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb index 227c9f917..d1eb6e28f 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb @@ -58,5 +58,5 @@ do_install() { } SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "ptpd.service" +SYSTEMD_SERVICE:${PN} = "ptpd.service" SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-openembedded/meta-networking/recipes-daemons/radvd/radvd.inc b/meta-openembedded/meta-networking/recipes-daemons/radvd/radvd.inc index 802dbe34e..2afaa4841 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/radvd/radvd.inc +++ b/meta-openembedded/meta-networking/recipes-daemons/radvd/radvd.inc @@ -23,10 +23,10 @@ SRC_URI = "http://v6web.litech.org/radvd/dist/radvd-${PV}.tar.gz \ inherit autotools useradd pkgconfig systemd -SYSTEMD_SERVICE_${PN} = "radvd.service" +SYSTEMD_SERVICE:${PN} = "radvd.service" SYSTEMD_AUTO_ENABLE = "disable" -do_install_append () { +do_install:append () { install -m 0755 -d ${D}${sysconfdir}/init.d \ ${D}${sysconfdir}/default/volatiles \ ${D}${docdir}/radvd @@ -58,9 +58,9 @@ do_install_append () { } USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system --home ${localstatedir}/run/radvd/ -M -g nogroup radvd" +USERADD_PARAM:${PN} = "--system --home ${localstatedir}/run/radvd/ -M -g nogroup radvd" -pkg_postinst_${PN} () { +pkg_postinst:${PN} () { if [ -z "$D" -a -x /etc/init.d/populate-volatile.sh ]; then /etc/init.d/populate-volatile.sh update fi diff --git a/meta-openembedded/meta-networking/recipes-daemons/squid/squid_4.15.bb b/meta-openembedded/meta-networking/recipes-daemons/squid/squid_4.15.bb index 8ba10674c..5af00d626 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/squid/squid_4.15.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/squid/squid_4.15.bb @@ -27,7 +27,7 @@ SRC_URI = "http://www.squid-cache.org/Versions/v${MAJ_VER}/${BPN}-${PV}.tar.bz2 file://0001-Fix-build-on-Fedora-Rawhide-772.patch \ " -SRC_URI_remove_toolchain-clang = "file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch" +SRC_URI:remove:toolchain-clang = "file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch" SRC_URI[sha256sum] = "71635811e766ce8b155225a9e3c7757cfc7ff93df26b28d82e5e6fc021b9a605" @@ -38,13 +38,13 @@ DEPENDS = "libtool krb5 openldap db cyrus-sasl" inherit autotools pkgconfig useradd ptest perlnative -LDFLAGS_append_mipsarch = " -latomic" -LDFLAGS_append_powerpc = " -latomic" -LDFLAGS_append_riscv64 = " -latomic" -LDFLAGS_append_riscv32 = " -latomic" +LDFLAGS:append:mipsarch = " -latomic" +LDFLAGS:append:powerpc = " -latomic" +LDFLAGS:append:riscv64 = " -latomic" +LDFLAGS:append:riscv32 = " -latomic" USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system --no-create-home --home-dir /var/run/squid --shell /bin/false --user-group squid" +USERADD_PARAM:${PN} = "--system --no-create-home --home-dir /var/run/squid --shell /bin/false --user-group squid" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ " @@ -68,7 +68,7 @@ export BUILDCXXFLAGS="${BUILD_CXXFLAGS}" TESTDIR = "test-suite" -do_configure_prepend() { +do_configure:prepend() { export SYSROOT=$PKG_CONFIG_SYSROOT_DIR } @@ -92,7 +92,7 @@ do_install_ptest() { sed -i 's:^TRUE = .*$:TRUE = /bin/true:' ${D}${PTEST_PATH}/${TESTDIR}/Makefile } -do_install_append() { +do_install:append() { if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/tmpfiles.d echo "d ${localstatedir}/run/${BPN} 0755 squid squid -" >> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf @@ -109,9 +109,9 @@ do_install_append() { rmdir --ignore-fail-on-non-empty "${D}${localstatedir}/log" } -FILES_${PN} += "${libdir} ${datadir}/errors ${datadir}/icons" -FILES_${PN}-dbg += "/usr/src/debug" -FILES_${PN}-doc += "${datadir}/*.txt" +FILES:${PN} += "${libdir} ${datadir}/errors ${datadir}/icons" +FILES:${PN}-dbg += "/usr/src/debug" +FILES:${PN}-doc += "${datadir}/*.txt" -RDEPENDS_${PN} += "perl" -RDEPENDS_${PN}-ptest += "make" +RDEPENDS:${PN} += "perl" +RDEPENDS:${PN}-ptest += "make" diff --git a/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb b/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb index dc1d6c67e..af42bda93 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb @@ -72,26 +72,26 @@ do_install() { sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/tftpd-hpa.service } -FILES_${PN} = "${bindir}" +FILES:${PN} = "${bindir}" PACKAGES += "tftp-hpa-server" -SUMMARY_tftp-hpa-server = "Server for the Trivial File Transfer Protocol" -FILES_tftp-hpa-server = "${sbindir} ${sysconfdir} ${localstatedir}" -CONFFILES_tftp-hpa-server = "${sysconfdir}/default/tftpd-hpa" +SUMMARY:tftp-hpa-server = "Server for the Trivial File Transfer Protocol" +FILES:tftp-hpa-server = "${sbindir} ${sysconfdir} ${localstatedir}" +CONFFILES:tftp-hpa-server = "${sysconfdir}/default/tftpd-hpa" INITSCRIPT_PACKAGES = "tftp-hpa-server" INITSCRIPT_NAME = "tftpd-hpa" INITSCRIPT_PARAMS = "start 20 2 3 4 5 . stop 20 1 ." -ALTERNATIVE_${PN}-doc = "tftpd.8 tftp.1" +ALTERNATIVE:${PN}-doc = "tftpd.8 tftp.1" ALTERNATIVE_LINK_NAME[tftpd.8] = "${mandir}/man8/tftpd.8" ALTERNATIVE_LINK_NAME[tftp.1] = "${mandir}/man1/tftp.1" -ALTERNATIVE_${PN} = "tftp" +ALTERNATIVE:${PN} = "tftp" ALTERNATIVE_TARGET[tftp] = "${bindir}/tftp-hpa" ALTERNATIVE_PRIORITY = "100" SYSTEMD_PACKAGES = "tftp-hpa-server" -SYSTEMD_SERVICE_tftp-hpa-server = "tftpd-hpa.socket tftpd-hpa.service" -SYSTEMD_AUTO_ENABLE_tftp-hpa-server = "enable" +SYSTEMD_SERVICE:tftp-hpa-server = "tftpd-hpa.socket tftpd-hpa.service" +SYSTEMD_AUTO_ENABLE:tftp-hpa-server = "enable" diff --git a/meta-openembedded/meta-networking/recipes-daemons/vblade/vblade_25.bb b/meta-openembedded/meta-networking/recipes-daemons/vblade/vblade_25.bb index 647abbfd2..15bf350c7 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/vblade/vblade_25.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/vblade/vblade_25.bb @@ -51,5 +51,5 @@ do_install() { INITSCRIPT_NAME = "vblade" INITSCRIPT_PARAMS = "start 30 . stop 70 0 1 2 3 4 5 6 ." -SYSTEMD_SERVICE_${PN} = "vblade.service" +SYSTEMD_SERVICE:${PN} = "vblade.service" SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-seccompsandbox.c-allow-newfstatat-and-pselect6-sysca.patch b/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-seccompsandbox.c-allow-newfstatat-and-pselect6-sysca.patch deleted file mode 100644 index 29ce85cc1..000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-seccompsandbox.c-allow-newfstatat-and-pselect6-sysca.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 7bc261076ec94efa3197beaca39eba095d162b5e Mon Sep 17 00:00:00 2001 -From: Yi Zhao <yi.zhao@windriver.com> -Date: Fri, 26 Feb 2021 16:32:27 +0800 -Subject: [PATCH] seccompsandbox.c: allow newfstatat and pselect6 syscalls in - the seccomp sandbox - -Allow newfstatat and pselect6 in the seccomp sanbox for glibc 2.33. - -Fixes the following OOPS error: -root@qemux86-64:~# tnftp 192.168.1.1 -Connected to 192.168.1.1. -220 (vsFTPd 3.0.3) -Name (192.168.1.1:root): anonymous -331 Please specify the password. -Password: -230 Login successful. -Remote system type is UNIX. -Using binary mode to transfer files. -ftp> ls -OOPS: priv_sock_get_cmd - -Upstream-Status: Pending - -Signed-off-by: Yi Zhao <yi.zhao@windriver.com> ---- - seccompsandbox.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/seccompsandbox.c b/seccompsandbox.c -index 377c50e..f601241 100644 ---- a/seccompsandbox.c -+++ b/seccompsandbox.c -@@ -267,6 +267,7 @@ seccomp_sandbox_setup_data_connections() - 3, IPPROTO_TCP); - allow_nr(__NR_bind); - allow_nr(__NR_select); -+ allow_nr(__NR_pselect6); - if (tunable_port_enable) - { - allow_nr(__NR_connect); -@@ -411,6 +412,7 @@ seccomp_sandbox_setup_postlogin(const struct vsf_session* p_sess) - allow_nr(__NR_getdents); - allow_nr(__NR_getdents64); - allow_nr(__NR_sysinfo); -+ allow_nr(__NR_newfstatat); - /* Misc */ - allow_nr(__NR_umask); - --- -2.17.1 - diff --git a/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-vsftpd-allow-syscalls-in-the-seccomp-sandbox.patch b/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-vsftpd-allow-syscalls-in-the-seccomp-sandbox.patch deleted file mode 100644 index 7573c967f..000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-vsftpd-allow-syscalls-in-the-seccomp-sandbox.patch +++ /dev/null @@ -1,46 +0,0 @@ -From dd353303f62d1dfe32cb000e482616b021708fbe Mon Sep 17 00:00:00 2001 -From: Mingli Yu <mingli.yu@windriver.com> -Date: Thu, 29 Nov 2018 00:47:34 -0800 -Subject: [PATCH] vsftpd: allow syscalls in the seccomp sandbox - -* Allow sysinfo() and getdents64 in the seccomp - sandbox otherwise comes below OOPS: priv_sock_get_cmd - as the syscall sysinfo() and getdents64 not allowed - -root@qemux86-64:~# tnftp 192.168.1.1 -Connected to 192.168.1.1. -220 (vsFTPd 3.0.3) -Name (192.168.1.1:root): anonymous -331 Please specify the password. -Password: -230 Login successful. -Remote system type is UNIX. -Using binary mode to transfer files. -ftp> prompt -Interactive mode off. -ftp> mget small* -OOPS: priv_sock_get_cmd - -Upstream-Status: Pending - -Signed-off-by: Mingli Yu <mingli.yu@windriver.com> ---- - seccompsandbox.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/seccompsandbox.c b/seccompsandbox.c -index 2c350a9..377c50e 100644 ---- a/seccompsandbox.c -+++ b/seccompsandbox.c -@@ -409,6 +409,8 @@ seccomp_sandbox_setup_postlogin(const struct vsf_session* p_sess) - allow_nr(__NR_getcwd); - allow_nr(__NR_chdir); - allow_nr(__NR_getdents); -+ allow_nr(__NR_getdents64); -+ allow_nr(__NR_sysinfo); - /* Misc */ - allow_nr(__NR_umask); - --- -2.17.1 - diff --git a/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-sysdeputil.c-Fix-with-musl-which-does-not-have-utmpx.patch b/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.5/0001-sysdeputil.c-Fix-with-musl-which-does-not-have-utmpx.patch index d81c94a4a..d81c94a4a 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-sysdeputil.c-Fix-with-musl-which-does-not-have-utmpx.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.5/0001-sysdeputil.c-Fix-with-musl-which-does-not-have-utmpx.patch diff --git a/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/makefile-destdir.patch b/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.5/makefile-destdir.patch index 5ad5c14e7..5ad5c14e7 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/makefile-destdir.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.5/makefile-destdir.patch diff --git a/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/makefile-libs.patch b/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.5/makefile-libs.patch index d2e58a325..d2e58a325 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/makefile-libs.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.5/makefile-libs.patch diff --git a/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/makefile-strip.patch b/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.5/makefile-strip.patch index e59607388..e59607388 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/makefile-strip.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.5/makefile-strip.patch diff --git a/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/nopam-with-tcp_wrappers.patch b/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.5/nopam-with-tcp_wrappers.patch index a4387c132..a4387c132 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/nopam-with-tcp_wrappers.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.5/nopam-with-tcp_wrappers.patch diff --git a/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/nopam.patch b/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.5/nopam.patch index cf0d68e27..cf0d68e27 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/nopam.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.5/nopam.patch diff --git a/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/vsftpd-2.1.0-filter.patch b/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.5/vsftpd-2.1.0-filter.patch index 590eb5857..590eb5857 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/vsftpd-2.1.0-filter.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.5/vsftpd-2.1.0-filter.patch diff --git a/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/vsftpd-tcp_wrappers-support.patch b/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.5/vsftpd-tcp_wrappers-support.patch index c558aee0a..c558aee0a 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/vsftpd-tcp_wrappers-support.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.5/vsftpd-tcp_wrappers-support.patch diff --git a/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb b/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.5.bb index 024b776de..08238c1a3 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.5.bb @@ -18,11 +18,9 @@ SRC_URI = "https://security.appspot.com/downloads/vsftpd-${PV}.tar.gz \ file://volatiles.99_vsftpd \ file://vsftpd.service \ file://vsftpd-2.1.0-filter.patch \ - file://0001-vsftpd-allow-syscalls-in-the-seccomp-sandbox.patch \ ${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', 'file://vsftpd-tcp_wrappers-support.patch', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '', '${NOPAM_SRC}', d)} \ file://0001-sysdeputil.c-Fix-with-musl-which-does-not-have-utmpx.patch \ - file://0001-seccompsandbox.c-allow-newfstatat-and-pselect6-sysca.patch \ " UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/v/vsftpd/" @@ -31,24 +29,23 @@ UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.orig\.tar" LIC_FILES_CHKSUM = "file://COPYING;md5=a6067ad950b28336613aed9dd47b1271 \ file://COPYRIGHT;md5=04251b2eb0f298dae376d92454f6f72e \ file://LICENSE;md5=654df2042d44b8cac8a5654fc5be63eb" -SRC_URI[md5sum] = "da119d084bd3f98664636ea05b5bb398" -SRC_URI[sha256sum] = "9d4d2bf6e6e2884852ba4e69e157a2cecd68c5a7635d66a3a8cf8d898c955ef7" +SRC_URI[sha256sum] = "26b602ae454b0ba6d99ef44a09b6b9e0dfa7f67228106736df1f278c70bc91d3" PACKAGECONFIG ??= "tcp-wrappers" PACKAGECONFIG[tcp-wrappers] = ",,tcp-wrappers" DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" -RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-listfile', '', d)}" +RDEPENDS:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-listfile', '', d)}" PAMLIB = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '-L${STAGING_BASELIBDIR} -lpam', '', d)}" WRAPLIB = "${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', '-lwrap', '', d)}" NOPAM_SRC ="${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', 'file://nopam-with-tcp_wrappers.patch', 'file://nopam.patch', d)}" inherit update-rc.d useradd systemd -CONFFILES_${PN} = "${sysconfdir}/vsftpd.conf" -LDFLAGS_append =" -lcrypt -lcap" -CFLAGS_append_libc-musl = " -D_GNU_SOURCE -include fcntl.h" +CONFFILES:${PN} = "${sysconfdir}/vsftpd.conf" +LDFLAGS:append =" -lcrypt -lcap" +CFLAGS:append:libc-musl = " -D_GNU_SOURCE -include fcntl.h" EXTRA_OEMAKE = "-e MAKEFLAGS=" do_configure() { @@ -95,17 +92,17 @@ do_install() { } INITSCRIPT_PACKAGES = "${PN}" -INITSCRIPT_NAME_${PN} = "vsftpd" -INITSCRIPT_PARAMS_${PN} = "defaults 80" +INITSCRIPT_NAME:${PN} = "vsftpd" +INITSCRIPT_PARAMS:${PN} = "defaults 80" USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system --home-dir /var/lib/ftp --no-create-home -g ftp \ +USERADD_PARAM:${PN} = "--system --home-dir /var/lib/ftp --no-create-home -g ftp \ --shell /bin/false ftp " -GROUPADD_PARAM_${PN} = "-r ftp" +GROUPADD_PARAM:${PN} = "-r ftp" -SYSTEMD_SERVICE_${PN} = "vsftpd.service" +SYSTEMD_SERVICE:${PN} = "vsftpd.service" -pkg_postinst_${PN}() { +pkg_postinst:${PN}() { if [ -z "$D" ]; then if type systemd-tmpfiles >/dev/null; then systemd-tmpfiles --create |