diff options
Diffstat (limited to 'meta-openembedded/meta-networking/recipes-support')
26 files changed, 748 insertions, 152 deletions
diff --git a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq/0001-dnsmasq-fix-memory-leak-in-helper-c.patch b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq/0001-dnsmasq-fix-memory-leak-in-helper-c.patch new file mode 100644 index 000000000..ccd6f82ae --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq/0001-dnsmasq-fix-memory-leak-in-helper-c.patch @@ -0,0 +1,49 @@ +From 69bc94779c2f035a9fffdb5327a54c3aeca73ed5 Mon Sep 17 00:00:00 2001 +From: Simon Kelley <simon@thekelleys.org.uk> +Date: Wed, 14 Aug 2019 20:44:50 +0100 +Subject: [PATCH] Fix memory leak in helper.c + +Thanks to Xu Mingjie <xumingjie1995@outlook.com> for spotting this. + +CVE: CVE-2019-14834 +Upstream-Status: Backport +Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> +--- + src/helper.c | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/src/helper.c b/src/helper.c +index 33ba120..c392eec 100644 +--- a/src/helper.c ++++ b/src/helper.c +@@ -82,7 +82,8 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd) + pid_t pid; + int i, pipefd[2]; + struct sigaction sigact; +- ++ unsigned char *alloc_buff = NULL; ++ + /* create the pipe through which the main program sends us commands, + then fork our process. */ + if (pipe(pipefd) == -1 || !fix_fd(pipefd[1]) || (pid = fork()) == -1) +@@ -188,11 +189,16 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd) + struct script_data data; + char *p, *action_str, *hostname = NULL, *domain = NULL; + unsigned char *buf = (unsigned char *)daemon->namebuff; +- unsigned char *end, *extradata, *alloc_buff = NULL; ++ unsigned char *end, *extradata; + int is6, err = 0; + int pipeout[2]; + +- free(alloc_buff); ++ /* Free rarely-allocated memory from previous iteration. */ ++ if (alloc_buff) ++ { ++ free(alloc_buff); ++ alloc_buff = NULL; ++ } + + /* we read zero bytes when pipe closed: this is our signal to exit */ + if (!read_write(pipefd[0], (unsigned char *)&data, sizeof(data), 1)) +-- +1.7.10.4 diff --git a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.80.bb b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.80.bb index 6f3d5daa6..827565051 100644 --- a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.80.bb +++ b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.80.bb @@ -5,5 +5,6 @@ SRC_URI[dnsmasq-2.80.sha256sum] = "9e4a58f816ce0033ce383c549b7d4058ad9b823968d35 SRC_URI += "\ file://lua.patch \ file://0001-dnsmasq-fix-build-against-5.2-headers.patch \ + file://0001-dnsmasq-fix-memory-leak-in-helper-c.patch \ " diff --git a/meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm_1.30.bb b/meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm_1.31.bb index b375ca94e..8fb116f57 100644 --- a/meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm_1.30.bb +++ b/meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm_1.31.bb @@ -22,8 +22,8 @@ SRC_URI = "https://mirrors.edge.kernel.org/pub/linux/utils/kernel/ipvsadm/${BP}. file://makefile-add-ldflags.patch \ " -SRC_URI[md5sum] = "97f11b6af1920fde5a9d9eac0d7f9e50" -SRC_URI[sha256sum] = "95573d70df473c9f63fc4ac496c044c69e3a6de7ccac119922210c0b44cd7a0c" +SRC_URI[md5sum] = "f6d1707c5baf684b58fd33682d67871f" +SRC_URI[sha256sum] = "1a0a5e25b5a1226435d2fb76341656f83a710183aebb0d204db39c0ec3bedfdb" UPSTREAM_CHECK_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/ipvsadm" diff --git a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.18.bb b/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.18.bb index 70cea6c7b..3cabc4ff8 100644 --- a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.18.bb +++ b/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.18.bb @@ -65,5 +65,6 @@ FILES_${PN}-dev += " \ FILES_${PN}-utils = "${bindir}/*" +RRECOMMENDS_${PN} += "kernel-module-sctp" RRECOMMENDS_${PN}-utils += "kernel-module-sctp" RRECOMMENDS_${PN}-ptest += "kernel-module-sctp" diff --git a/meta-openembedded/meta-networking/recipes-support/memcached/memcached_1.5.10.bb b/meta-openembedded/meta-networking/recipes-support/memcached/memcached_1.5.20.bb index d2cafc9f6..37a77c364 100644 --- a/meta-openembedded/meta-networking/recipes-support/memcached/memcached_1.5.10.bb +++ b/meta-openembedded/meta-networking/recipes-support/memcached/memcached_1.5.20.bb @@ -22,8 +22,8 @@ RDEPENDS_${PN} += "perl perl-module-posix perl-module-autoloader \ SRC_URI = "http://www.memcached.org/files/${BP}.tar.gz \ file://memcached-add-hugetlbfs-check.patch \ " -SRC_URI[md5sum] = "8462616b554183a75845b03c56837cca" -SRC_URI[sha256sum] = "494c060dbd96d546c74ab85a3cc3984d009b4423767ac33e05dd2340c01f1c4b" +SRC_URI[md5sum] = "4b64296ea0eeccdee9168c035e0488ab" +SRC_URI[sha256sum] = "cfd7b023a9cefe7ae8a67184f51d841dbbf97994ed0e8a55e31ee092320ea1e4" # set the same COMPATIBLE_HOST as libhugetlbfs COMPATIBLE_HOST = '(i.86|x86_64|powerpc|powerpc64|arm).*-linux' diff --git a/meta-openembedded/meta-networking/recipes-support/netcat/netcat/gettext.patch b/meta-openembedded/meta-networking/recipes-support/netcat/netcat/gettext.patch new file mode 100644 index 000000000..f2e5f9927 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/netcat/netcat/gettext.patch @@ -0,0 +1,16 @@ +Fix build with gettext 0.20.x + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- a/configure.ac ++++ b/configure.ac +@@ -49,7 +49,7 @@ AC_SUBST(all_libraries) + dnl I18n support + ALL_LINGUAS="it sk" + AM_GNU_GETTEXT([external], need-ngettext) +-AM_INTL_SUBDIR ++#AM_INTL_SUBDIR + + dnl find resolver functions and the socket library on some broken OS + AC_LBL_LIBRARY_NET diff --git a/meta-openembedded/meta-networking/recipes-support/netcat/netcat_0.7.1.bb b/meta-openembedded/meta-networking/recipes-support/netcat/netcat_0.7.1.bb index d961af542..14d743f82 100644 --- a/meta-openembedded/meta-networking/recipes-support/netcat/netcat_0.7.1.bb +++ b/meta-openembedded/meta-networking/recipes-support/netcat/netcat_0.7.1.bb @@ -8,6 +8,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/netcat/netcat-${PV}.tar.bz2 \ file://obsolete_autoconf_macros.patch \ file://netcat-locale_h.patch \ file://make-netcat_flag_count_work.patch \ + file://gettext.patch \ " SRC_URI[md5sum] = "0a29eff1736ddb5effd0b1ec1f6fe0ef" diff --git a/meta-openembedded/meta-networking/recipes-support/netperf/netperf_git.bb b/meta-openembedded/meta-networking/recipes-support/netperf/netperf_git.bb index 8921ea746..f1f62df06 100644 --- a/meta-openembedded/meta-networking/recipes-support/netperf/netperf_git.bb +++ b/meta-openembedded/meta-networking/recipes-support/netperf/netperf_git.bb @@ -31,6 +31,8 @@ CFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', \ PACKAGECONFIG ??= "" PACKAGECONFIG[sctp] = "--enable-sctp,--disable-sctp,lksctp-tools," +PACKAGECONFIG[intervals] = "--enable-intervals,--disable-intervals,," +PACKAGECONFIG[histogram] = "--enable-histogram,--disable-histogram,," # autotools.bbclass attends to include m4 files with path depth <= 2 by # "find ${S} -maxdepth 2 -name \*.m4", so move m4 files from m4/m4. diff --git a/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.39.2.bb b/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.40.0.bb index c27afdb55..f37e9b746 100644 --- a/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.39.2.bb +++ b/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.40.0.bb @@ -11,8 +11,8 @@ SRC_URI = "\ https://github.com/nghttp2/nghttp2/releases/download/v${PV}/nghttp2-${PV}.tar.xz \ file://0001-fetch-ocsp-response-use-python3.patch \ " -SRC_URI[md5sum] = "de52cd6b587b76486346745514972995" -SRC_URI[sha256sum] = "a2d216450abd2beaf4e200c168957968e89d602ca4119338b9d7ab059fd4ce8b" +SRC_URI[md5sum] = "8d1a6b96760254e4dd142d7176e8fb7c" +SRC_URI[sha256sum] = "09fc43d428ff237138733c737b29fb1a7e49d49de06d2edbed3bc4cdcee69073" inherit cmake manpages pythonnative PACKAGECONFIG[manpages] = "" diff --git a/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntp.conf b/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntp.conf index 676e18645..b59003092 100644 --- a/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntp.conf +++ b/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntp.conf @@ -14,4 +14,8 @@ driftfile /var/lib/ntp/drift server 127.127.1.0 fudge 127.127.1.0 stratum 14 # Defining a default security setting -restrict default +restrict -4 default notrap nomodify nopeer noquery +restrict -6 default notrap nomodify nopeer noquery + +restrict 127.0.0.1 # allow local host +restrict ::1 # allow local host diff --git a/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p13.bb b/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p13.bb index 9b327ba2f..e950fabe3 100644 --- a/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p13.bb +++ b/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p13.bb @@ -105,7 +105,7 @@ do_install_append() { rmdir --ignore-fail-on-non-empty ${D}${libexecdir} } -PACKAGES += "ntpdate sntp ntpq ${PN}-tickadj ${PN}-utils" +PACKAGES += "ntpdate sntp ntpdc ntpq ${PN}-tickadj ${PN}-utils" # NOTE: you don't need ntpdate, use "ntpd -q -g -x" # ntp originally includes tickadj. It's split off for inclusion in small firmware images on platforms @@ -117,8 +117,8 @@ RDEPENDS_${PN} += "libgcc" RPROVIDES_${PN}-utils = "${PN}-bin" RREPLACES_${PN}-utils = "${PN}-bin" RCONFLICTS_${PN}-utils = "${PN}-bin" -# ntpq was split out of ntp-utils -RDEPENDS_${PN}-utils = "ntpq" +# ntpdc and ntpq were split out of ntp-utils +RDEPENDS_${PN}-utils = "ntpdc ntpq" SYSTEMD_PACKAGES = "${PN} ntpdate sntp" SYSTEMD_SERVICE_${PN} = "ntpd.service" @@ -153,6 +153,7 @@ FILES_sntp = "${sbindir}/sntp \ ${sysconfdir}/default/sntp \ ${systemd_unitdir}/system/sntp.service \ " +FILES_ntpdc = "${sbindir}/ntpdc" FILES_ntpq = "${sbindir}/ntpq" CONFFILES_${PN} = "${sysconfdir}/ntp.conf" diff --git a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch index 4b595613f..f1437a0fb 100644 --- a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch +++ b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch @@ -14,14 +14,67 @@ Fixes errors | cmake_install.cmake:48 (include) Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Update for version 26.1. Remove more man files which can no be built. + +Signed-off-by: Kai Kang <kai.kang@windriver.com> --- - libibumad/man/CMakeLists.txt | 1 - - libibverbs/man/CMakeLists.txt | 15 --------------- - providers/mlx5/man/CMakeLists.txt | 1 - - 3 files changed, 17 deletions(-) + infiniband-diags/man/CMakeLists.txt | 34 ------------------- + libibumad/man/CMakeLists.txt | 2 -- + libibverbs/man/CMakeLists.txt | 52 ----------------------------- + librdmacm/man/CMakeLists.txt | 2 -- + providers/efa/man/CMakeLists.txt | 2 -- + providers/mlx4/man/CMakeLists.txt | 1 - + providers/mlx5/man/CMakeLists.txt | 65 ------------------------------------- + 7 files changed, 158 deletions(-) +diff --git a/infiniband-diags/man/CMakeLists.txt b/infiniband-diags/man/CMakeLists.txt +index 1f1f91c9..094a389f 100644 +--- a/infiniband-diags/man/CMakeLists.txt ++++ b/infiniband-diags/man/CMakeLists.txt +@@ -46,40 +46,6 @@ rdma_rst_common( + ) + + rdma_man_pages( +- check_lft_balance.8.in.rst +- dump_fts.8.in.rst +- ibaddr.8.in.rst +- ibcacheedit.8.in.rst +- ibccconfig.8.in.rst +- ibccquery.8.in.rst +- ibfindnodesusing.8.in.rst +- ibhosts.8.in.rst +- ibidsverify.8.in.rst +- iblinkinfo.8.in.rst +- ibnetdiscover.8.in.rst +- ibnodes.8.in.rst +- ibping.8.in.rst +- ibportstate.8.in.rst +- ibqueryerrors.8.in.rst +- ibroute.8.in.rst +- ibrouters.8.in.rst +- ibstat.8.in.rst +- ibstatus.8.in.rst +- ibswitches.8.in.rst +- ibsysstat.8.in.rst +- ibtracert.8.in.rst +- infiniband-diags.8.in.rst +- perfquery.8.in.rst +- saquery.8.in.rst +- sminfo.8.in.rst +- smpdump.8.in.rst +- smpquery.8.in.rst +- vendstat.8.in.rst +- ) +- +-rdma_alias_man_pages( +- dump_fts.8 dump_lfts.8 +- dump_fts.8 dump_mfts.8 + ) + + if (ENABLE_IBDIAGS_COMPAT) diff --git a/libibumad/man/CMakeLists.txt b/libibumad/man/CMakeLists.txt -index 185584a0..ac45a4e9 100644 +index 185584a0..857a4b8b 100644 --- a/libibumad/man/CMakeLists.txt +++ b/libibumad/man/CMakeLists.txt @@ -15,7 +15,6 @@ rdma_man_pages( @@ -32,19 +85,34 @@ index 185584a0..ac45a4e9 100644 umad_open_port.3 umad_poll.3 umad_recv.3 +@@ -38,5 +37,4 @@ rdma_alias_man_pages( + umad_class_str.3 umad_method_str.3 + umad_get_ca.3 umad_release_ca.3 + umad_get_port.3 umad_release_port.3 +- umad_init.3 umad_done.3 + ) diff --git a/libibverbs/man/CMakeLists.txt b/libibverbs/man/CMakeLists.txt -index 86dd49de..b54675be 100644 +index e1d5edf8..92c68611 100644 --- a/libibverbs/man/CMakeLists.txt +++ b/libibverbs/man/CMakeLists.txt -@@ -5,7 +5,6 @@ rdma_man_pages( +@@ -1,24 +1,18 @@ + rdma_man_pages( +- ibv_advise_mr.3.md + ibv_alloc_dm.3 + ibv_alloc_mw.3 +- ibv_alloc_null_mr.3.md + ibv_alloc_parent_domain.3 ibv_alloc_pd.3 ibv_alloc_td.3 ibv_asyncwatch.1 +- ibv_attach_counters_point_flow.3.md - ibv_attach_mcast.3.md ibv_bind_mw.3 ibv_create_ah.3 ibv_create_ah_from_wc.3 -@@ -14,7 +13,6 @@ rdma_man_pages( + ibv_create_comp_channel.3 +- ibv_create_counters.3.md + ibv_create_cq.3 ibv_create_cq_ex.3 ibv_modify_cq.3 ibv_create_flow.3 @@ -52,7 +120,7 @@ index 86dd49de..b54675be 100644 ibv_create_qp.3 ibv_create_qp_ex.3 ibv_create_rwq_ind_table.3 -@@ -23,15 +21,9 @@ rdma_man_pages( +@@ -27,16 +21,8 @@ rdma_man_pages( ibv_create_wq.3 ibv_devices.1 ibv_devinfo.1 @@ -61,14 +129,15 @@ index 86dd49de..b54675be 100644 ibv_get_async_event.3 ibv_get_cq_event.3 - ibv_get_device_guid.3.md - ibv_get_device_list.3 +- ibv_get_device_list.3.md - ibv_get_device_name.3.md +- ibv_get_pkey_index.3.md - ibv_get_srq_num.3.md - ibv_inc_rkey.3.md ibv_modify_qp.3 ibv_modify_qp_rate_limit.3 ibv_modify_srq.3 -@@ -46,19 +38,12 @@ rdma_man_pages( +@@ -51,24 +37,15 @@ rdma_man_pages( ibv_post_srq_recv.3 ibv_query_device.3 ibv_query_device_ex.3 @@ -81,6 +150,7 @@ index 86dd49de..b54675be 100644 - ibv_rate_to_mbps.3.md - ibv_rate_to_mult.3.md ibv_rc_pingpong.1 +- ibv_read_counters.3.md ibv_reg_mr.3 - ibv_req_notify_cq.3.md - ibv_rereg_mr.3.md @@ -88,16 +158,175 @@ index 86dd49de..b54675be 100644 ibv_srq_pingpong.1 ibv_uc_pingpong.1 ibv_ud_pingpong.1 +- ibv_wr_post.3.md + ibv_xsrq_pingpong.1 + ) + rdma_alias_man_pages( +@@ -79,47 +56,18 @@ rdma_alias_man_pages( + ibv_alloc_mw.3 ibv_dealloc_mw.3 + ibv_alloc_pd.3 ibv_dealloc_pd.3 + ibv_alloc_td.3 ibv_dealloc_td.3 +- ibv_attach_mcast.3 ibv_detach_mcast.3 + ibv_create_ah.3 ibv_destroy_ah.3 + ibv_create_ah_from_wc.3 ibv_init_ah_from_wc.3 + ibv_create_comp_channel.3 ibv_destroy_comp_channel.3 +- ibv_create_counters.3 ibv_destroy_counters.3 + ibv_create_cq.3 ibv_destroy_cq.3 + ibv_create_flow.3 ibv_destroy_flow.3 +- ibv_create_flow_action.3 ibv_destroy_flow_action.3 +- ibv_create_flow_action.3 ibv_modify_flow_action.3 + ibv_create_qp.3 ibv_destroy_qp.3 + ibv_create_rwq_ind_table.3 ibv_destroy_rwq_ind_table.3 + ibv_create_srq.3 ibv_destroy_srq.3 + ibv_create_wq.3 ibv_destroy_wq.3 +- ibv_event_type_str.3 ibv_node_type_str.3 +- ibv_event_type_str.3 ibv_port_state_str.3 + ibv_get_async_event.3 ibv_ack_async_event.3 + ibv_get_cq_event.3 ibv_ack_cq_events.3 +- ibv_get_device_list.3 ibv_free_device_list.3 + ibv_open_device.3 ibv_close_device.3 + ibv_open_xrcd.3 ibv_close_xrcd.3 +- ibv_rate_to_mbps.3 mbps_to_ibv_rate.3 +- ibv_rate_to_mult.3 mult_to_ibv_rate.3 + ibv_reg_mr.3 ibv_dereg_mr.3 +- ibv_wr_post.3 ibv_wr_abort.3 +- ibv_wr_post.3 ibv_wr_complete.3 +- ibv_wr_post.3 ibv_wr_start.3 +- ibv_wr_post.3 ibv_wr_atomic_cmp_swp.3 +- ibv_wr_post.3 ibv_wr_atomic_fetch_add.3 +- ibv_wr_post.3 ibv_wr_bind_mw.3 +- ibv_wr_post.3 ibv_wr_local_inv.3 +- ibv_wr_post.3 ibv_wr_rdma_read.3 +- ibv_wr_post.3 ibv_wr_rdma_write.3 +- ibv_wr_post.3 ibv_wr_rdma_write_imm.3 +- ibv_wr_post.3 ibv_wr_send.3 +- ibv_wr_post.3 ibv_wr_send_imm.3 +- ibv_wr_post.3 ibv_wr_send_inv.3 +- ibv_wr_post.3 ibv_wr_send_tso.3 +- ibv_wr_post.3 ibv_wr_set_inline_data.3 +- ibv_wr_post.3 ibv_wr_set_inline_data_list.3 +- ibv_wr_post.3 ibv_wr_set_sge.3 +- ibv_wr_post.3 ibv_wr_set_sge_list.3 +- ibv_wr_post.3 ibv_wr_set_ud_addr.3 +- ibv_wr_post.3 ibv_wr_set_xrc_srqn.3 + ) +diff --git a/librdmacm/man/CMakeLists.txt b/librdmacm/man/CMakeLists.txt +index 2d1efbff..d016c926 100644 +--- a/librdmacm/man/CMakeLists.txt ++++ b/librdmacm/man/CMakeLists.txt +@@ -20,7 +20,6 @@ rdma_man_pages( + rdma_destroy_qp.3 + rdma_destroy_srq.3 + rdma_disconnect.3 +- rdma_establish.3.md + rdma_event_str.3 + rdma_free_devices.3 + rdma_get_cm_event.3 +@@ -33,7 +32,6 @@ rdma_man_pages( + rdma_get_send_comp.3 + rdma_get_src_port.3 + rdma_getaddrinfo.3 +- rdma_init_qp_attr.3.md + rdma_join_multicast.3 + rdma_join_multicast_ex.3 + rdma_leave_multicast.3 +diff --git a/providers/efa/man/CMakeLists.txt b/providers/efa/man/CMakeLists.txt +index d6a4f57b..376f293d 100644 +--- a/providers/efa/man/CMakeLists.txt ++++ b/providers/efa/man/CMakeLists.txt +@@ -1,4 +1,2 @@ + rdma_man_pages( +- efadv_create_driver_qp.3.md +- efadv.7.md + ) +diff --git a/providers/mlx4/man/CMakeLists.txt b/providers/mlx4/man/CMakeLists.txt +index 3df77caf..99a75101 100644 +--- a/providers/mlx4/man/CMakeLists.txt ++++ b/providers/mlx4/man/CMakeLists.txt +@@ -1,6 +1,5 @@ + rdma_man_pages( + mlx4dv_init_obj.3 + mlx4dv_query_device.3 +- mlx4dv_set_context_attr.3.md + mlx4dv.7 + ) diff --git a/providers/mlx5/man/CMakeLists.txt b/providers/mlx5/man/CMakeLists.txt -index cdc7115e..876b6fcf 100644 +index 0bd9eba1..876b6fcf 100644 --- a/providers/mlx5/man/CMakeLists.txt +++ b/providers/mlx5/man/CMakeLists.txt -@@ -1,5 +1,4 @@ +@@ -1,72 +1,7 @@ rdma_man_pages( +- mlx5dv_alloc_dm.3.md +- mlx5dv_create_cq.3.md +- mlx5dv_create_flow.3.md +- mlx5dv_create_flow_action_modify_header.3.md +- mlx5dv_create_flow_action_packet_reformat.3.md +- mlx5dv_create_flow_matcher.3.md +- mlx5dv_create_mkey.3.md +- mlx5dv_create_qp.3.md +- mlx5dv_devx_alloc_uar.3.md +- mlx5dv_devx_create_cmd_comp.3.md +- mlx5dv_devx_create_event_channel.3.md +- mlx5dv_devx_get_event.3.md +- mlx5dv_devx_obj_create.3.md +- mlx5dv_devx_qp_modify.3.md +- mlx5dv_devx_query_eqn.3.md +- mlx5dv_devx_subscribe_devx_event.3.md +- mlx5dv_devx_umem_reg.3.md +- mlx5dv_dr_flow.3.md - mlx5dv_flow_action_esp.3.md mlx5dv_get_clock_info.3 mlx5dv_init_obj.3 +- mlx5dv_is_supported.3.md +- mlx5dv_open_device.3.md mlx5dv_query_device.3 + mlx5dv_ts_to_ns.3 +- mlx5dv_wr_post.3.md + mlx5dv.7 + ) +-rdma_alias_man_pages( +- mlx5dv_create_mkey.3 mlx5dv_destroy_mkey.3 +- mlx5dv_devx_alloc_uar.3 mlx5dv_devx_free_uar.3 +- mlx5dv_devx_create_cmd_comp.3 mlx5dv_devx_destroy_cmd_comp.3 +- mlx5dv_devx_create_event_channel.3 mlx5dv_devx_destroy_event_channel.3 +- mlx5dv_devx_create_cmd_comp.3 mlx5dv_devx_get_async_cmd_comp.3 +- mlx5dv_devx_obj_create.3 mlx5dv_devx_general_cmd.3 +- mlx5dv_devx_obj_create.3 mlx5dv_devx_obj_destroy.3 +- mlx5dv_devx_obj_create.3 mlx5dv_devx_obj_query.3 +- mlx5dv_devx_obj_create.3 mlx5dv_devx_obj_query_async.3 +- mlx5dv_devx_obj_create.3 mlx5dv_devx_obj_modify.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_qp_query.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_cq_modify.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_cq_query.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_wq_modify.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_wq_query.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_srq_modify.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_srq_query.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_ind_tbl_modify.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_ind_tbl_query.3 +- mlx5dv_devx_subscribe_devx_event.3 mlx5dv_devx_subscribe_devx_event_fd.3 +- mlx5dv_devx_umem_reg.3 mlx5dv_devx_umem_dereg.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_dest_table.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_dest_ibv_qp.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_dest_vport.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_flow_counter.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_drop.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_modify_header.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_packet_reformat.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_tag.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_destroy.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_domain_create.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_domain_destroy.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_domain_sync.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_matcher_create.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_matcher_destroy.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_rule_create.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_rule_destroy.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_table_create.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_table_destroy.3 +- mlx5dv_wr_post.3 mlx5dv_wr_set_dc_addr.3 +- mlx5dv_wr_post.3 mlx5dv_qp_ex_from_ibv_qp_ex.3 +-) -- 2.17.1 diff --git a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0001-S_IFSOCK-is-defined-in-both-glibc-musl.patch b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0001-S_IFSOCK-is-defined-in-both-glibc-musl.patch deleted file mode 100644 index b04c9b723..000000000 --- a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0001-S_IFSOCK-is-defined-in-both-glibc-musl.patch +++ /dev/null @@ -1,29 +0,0 @@ -From f2df1db11f3a9580774300e703b6f53dbcdb28ef Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 8 Jun 2018 20:17:57 -0700 -Subject: [PATCH] S_IFSOCK is defined in both glibc/musl - -Fixes - -preload.c:1183:46: error: '__S_IFSOCK' undeclared (first use in this function); did you mean 'S_IFSOCK'? - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - librdmacm/preload.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/librdmacm/preload.c b/librdmacm/preload.c -index 0f2aa250..d46beb1b 100644 ---- a/librdmacm/preload.c -+++ b/librdmacm/preload.c -@@ -1180,7 +1180,7 @@ int __fxstat(int ver, int socket, struct stat *buf) - if (fd_get(socket, &fd) == fd_rsocket) { - ret = real.fxstat(ver, socket, buf); - if (!ret) -- buf->st_mode = (buf->st_mode & ~S_IFMT) | __S_IFSOCK; -+ buf->st_mode = (buf->st_mode & ~S_IFMT) | S_IFSOCK; - } else { - ret = real.fxstat(ver, fd, buf); - } diff --git a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0001-include-endian.h-for-htole32-and-friends.patch b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0001-include-endian.h-for-htole32-and-friends.patch deleted file mode 100644 index aa335244b..000000000 --- a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0001-include-endian.h-for-htole32-and-friends.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 65b9a47c07be4611b4fbbcafff1993186bcb0537 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 12 Jun 2018 19:15:52 -0700 -Subject: [PATCH 1/2] include endian.h for htole32 and friends - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - providers/hns/hns_roce_u.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/providers/hns/hns_roce_u.h b/providers/hns/hns_roce_u.h -index bd66c6e7..b07424db 100644 ---- a/providers/hns/hns_roce_u.h -+++ b/providers/hns/hns_roce_u.h -@@ -34,6 +34,7 @@ - #define _HNS_ROCE_U_H - - #include <stddef.h> -+#include <endian.h> - #include <util/compiler.h> - - #include <infiniband/driver.h> --- -2.17.1 - diff --git a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-sched_yield-instead-of-pthread_yield.patch b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-sched_yield-instead-of-pthread_yield.patch new file mode 100644 index 000000000..80abd3313 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-sched_yield-instead-of-pthread_yield.patch @@ -0,0 +1,30 @@ +From 6ac9562d756d42592994aeaac7a5e7b2bbce5cab Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 14 Dec 2019 14:07:57 -0800 +Subject: [PATCH] librdmacm: Use sched_yield instead of pthread_yield + +glibc redirects pthread_yield to sched_yield additionally we get it +working with musl on linux + +Upstream-Status: Submitted [https://github.com/linux-rdma/rdma-core/pull/635] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + librdmacm/rsocket.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/librdmacm/rsocket.c b/librdmacm/rsocket.c +index 89ae2139..7fc5b266 100644 +--- a/librdmacm/rsocket.c ++++ b/librdmacm/rsocket.c +@@ -3038,7 +3038,7 @@ static int rs_poll_enter(void) + pthread_mutex_lock(&mut); + if (suspendpoll) { + pthread_mutex_unlock(&mut); +- pthread_yield(); ++ sched_yield(); + return -EBUSY; + } + +-- +2.24.1 + diff --git a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0002-Remove-unused-include-for-execinfo.h.patch b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0002-Remove-unused-include-for-execinfo.h.patch deleted file mode 100644 index 347f964e9..000000000 --- a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0002-Remove-unused-include-for-execinfo.h.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 3d9cae15c69c0b3260a024ad5d6802a8d85515a2 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 12 Jun 2018 19:18:24 -0700 -Subject: [PATCH 2/2] Remove unused include for execinfo.h - -Fixes build on musl - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - providers/qedr/qelr_verbs.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/providers/qedr/qelr_verbs.c b/providers/qedr/qelr_verbs.c -index e3b01f28..2ee1c832 100644 ---- a/providers/qedr/qelr_verbs.c -+++ b/providers/qedr/qelr_verbs.c -@@ -54,7 +54,6 @@ - - #include <stdio.h> - #include <stdlib.h> --#include <execinfo.h> - - #define QELR_SQE_ELEMENT_SIZE (sizeof(struct rdma_sq_sge)) - #define QELR_RQE_ELEMENT_SIZE (sizeof(struct rdma_rq_sge)) --- -2.17.1 - diff --git a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0002-neigh.c-Do-not-include-net-if_packet.h.patch b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0002-neigh.c-Do-not-include-net-if_packet.h.patch deleted file mode 100644 index e887f222b..000000000 --- a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0002-neigh.c-Do-not-include-net-if_packet.h.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 82486f7e1ee2aa07a5c12cb357834993aa8c1d20 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 8 Jun 2018 20:19:13 -0700 -Subject: [PATCH] neigh.c: Do not include net/if_packet.h - -This header is glibc specific - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - libibverbs/neigh.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/libibverbs/neigh.c b/libibverbs/neigh.c -index 21177db0..cfc593a0 100644 ---- a/libibverbs/neigh.c -+++ b/libibverbs/neigh.c -@@ -2,7 +2,6 @@ - */ - - #include "config.h" --#include <net/if_packet.h> - #include <linux/netlink.h> - #include <linux/rtnetlink.h> - #include <endian.h> diff --git a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_18.1.bb b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_27.0.bb index 6ad864d1e..361d69b33 100644 --- a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_18.1.bb +++ b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_27.0.bb @@ -5,14 +5,12 @@ SECTION = "libs" DEPENDS = "libnl" RDEPENDS_${PN} = "bash perl" -SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=stable-v18 \ - file://0001-S_IFSOCK-is-defined-in-both-glibc-musl.patch \ - file://0002-neigh.c-Do-not-include-net-if_packet.h.patch \ - file://0001-include-endian.h-for-htole32-and-friends.patch \ - file://0002-Remove-unused-include-for-execinfo.h.patch \ +BRANCH = "stable-v${@d.getVar('PV').split('.')[0]}" +SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=${BRANCH} \ file://0001-Remove-man-files-which-cant-be-built.patch \ + file://0001-librdmacm-Use-sched_yield-instead-of-pthread_yield.patch \ " -SRCREV = "7844b3fbe5120623d63b29ecb43eb83a61129658" +SRCREV = "84caf035ae6123e2296b72006cd2cf698c65eb46" S = "${WORKDIR}/git" #Default Dual License https://github.com/linux-rdma/rdma-core/blob/master/COPYING.md @@ -20,11 +18,26 @@ LICENSE = "BSD-2-Clause | GPLv2" LIC_FILES_CHKSUM = "file://COPYING.BSD_FB;md5=0ec18bae1a9df92c8d6ae01f94a289ae \ file://COPYING.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263" +EXTRA_OECMAKE = " \ + -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=${systemd_system_unitdir} \ + -DCMAKE_INSTALL_PERLDIR=${libdir}/perl5/${@get_perl_version(d)} \ +" FILES_SOLIBSDEV = "" FILES_${PN} += "${libdir}/*" INSANE_SKIP_${PN} += "dev-so" -inherit cmake +inherit cmake cpan-base systemd + +SYSTEMD_SERVICE_${PN} = " \ + srp_daemon.service \ + iwpmd.service \ + ibacm.socket \ + rdma-load-modules@.service \ + srp_daemon_port@.service \ + rdma-hw.target \ + ibacm.service \ +" +SYSTEMD_AUTO_ENABLE = "disable" OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH" diff --git a/meta-openembedded/meta-networking/recipes-support/ruli/files/float-conversion.patch b/meta-openembedded/meta-networking/recipes-support/ruli/files/float-conversion.patch new file mode 100644 index 000000000..999f23fc6 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/ruli/files/float-conversion.patch @@ -0,0 +1,19 @@ +clarify type conversion + +fixes +| ruli_rand.c:54:47: error: implicit conversion from 'unsigned int' to 'float' changes value from 4294967295 to 4294967296 [-Werror,-Wimplicit-int-float-conversion] +| + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/src/ruli_rand.c ++++ b/src/ruli_rand.c +@@ -51,7 +51,7 @@ int ruli_rand_next(ruli_rand_t *rand_ctx + + u = isaac_rand(&rand_ctx->isaac_ctx); + +- r = (int) ((float) (1.0 + max - min) * u / ISAAC_UB4MAXVAL + min); ++ r = (int) ((float) (1.0 + max - min) * u / (float) (ISAAC_UB4MAXVAL + min)); + + assert(min <= r); + assert(r <= max); diff --git a/meta-openembedded/meta-networking/recipes-support/ruli/ruli_0.36.bb b/meta-openembedded/meta-networking/recipes-support/ruli/ruli_0.36.bb index b82a3d08e..f920b592a 100644 --- a/meta-openembedded/meta-networking/recipes-support/ruli/ruli_0.36.bb +++ b/meta-openembedded/meta-networking/recipes-support/ruli/ruli_0.36.bb @@ -12,6 +12,7 @@ SRC_URI = "http://download.savannah.gnu.org/releases/ruli/ruli_${PV}.orig.tar.gz file://0001-src-ruli_addr.c-Add-missing-format-string.patch \ file://0001-ruli_srv-Mark-prev_addr_list_size-as-unused.patch \ file://0001-Make-space-for-flags-from-environment.patch \ + file://float-conversion.patch \ " SRC_URI[md5sum] = "e73fbfdeadddb68a703a70cea5271468" @@ -19,7 +20,10 @@ SRC_URI[sha256sum] = "11d32def5b514748fbd9ea8c88049ae99e1bb358efc74eb91a4d268a39 B = "${S}" -EXTRA_OEMAKE = 'CC="${CC}" OOP_BASE_DIR="${STAGING_EXECPREFIXDIR}" INSTALL_BASE_DIR="${D}${exec_prefix}"' +EXTRA_OEMAKE = 'CC="${CC}" OOP_BASE_DIR="${STAGING_EXECPREFIXDIR}" \ + INSTALL_BASE_DIR="${D}${exec_prefix}" \ + OOP_LIB_DIR=${STAGING_EXECPREFIXDIR}/${baselib} \ + INSTALL_LIB_DIR=${D}${libdir}' do_configure() { touch configure-stamp diff --git a/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.8.1.bb b/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.8.2.bb index b521633ff..f05d69669 100644 --- a/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.8.1.bb +++ b/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.8.2.bb @@ -12,8 +12,8 @@ SRC_URI = "http://download.strongswan.org/strongswan-${PV}.tar.bz2 \ file://0001-memory.h-Include-stdint.h-for-uintptr_t.patch \ " -SRC_URI[md5sum] = "5a6b9980cd1ac4fad3c24b55ed960ac9" -SRC_URI[sha256sum] = "d9af70acea5c054952ad1584916c1bf231b064eb6c8a9791dcb6ae90a769990c" +SRC_URI[md5sum] = "d94eac2caed51b0cc776e5887b10bace" +SRC_URI[sha256sum] = "86900ddbe7337c923dadf2c8339ae8ed2b9158e3691745884d08ae534677430e" UPSTREAM_CHECK_REGEX = "strongswan-(?P<pver>\d+(\.\d+)+)\.tar" diff --git a/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.55.bb b/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.56.bb index df455dbe3..3411e5d0c 100644 --- a/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.55.bb +++ b/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.56.bb @@ -6,7 +6,7 @@ SECTION = "net" # a combined work based on stunnel. Thus, the terms and conditions of the GNU # General Public License cover the whole combination. LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=c7acb24399f540ea323acb0366aecdbe" +LIC_FILES_CHKSUM = "file://COPYING.md;md5=d6d635d290ba1705821254a0278f1ef7" DEPENDS = "autoconf-archive libnsl2 openssl" @@ -14,8 +14,8 @@ SRC_URI = "ftp://ftp.stunnel.org/stunnel/archive/5.x/${BP}.tar.gz \ file://fix-openssl-no-des.patch \ " -SRC_URI[md5sum] = "7b41592034ede114e8c4e058fc8c238b" -SRC_URI[sha256sum] = "90de69f41c58342549e74c82503555a6426961b29af3ed92f878192727074c62" +SRC_URI[md5sum] = "01b0ca9e071f582ff803a85d5ed72166" +SRC_URI[sha256sum] = "7384bfb356b9a89ddfee70b5ca494d187605bb516b4fff597e167f97e2236b22" inherit autotools diff --git a/meta-openembedded/meta-networking/recipes-support/tinyproxy/tinyproxy/tinyproxy.conf b/meta-openembedded/meta-networking/recipes-support/tinyproxy/tinyproxy/tinyproxy.conf new file mode 100644 index 000000000..4ca18efa5 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/tinyproxy/tinyproxy/tinyproxy.conf @@ -0,0 +1,330 @@ +## +## tinyproxy.conf -- tinyproxy daemon configuration file +## +## This example tinyproxy.conf file contains example settings +## with explanations in comments. For decriptions of all +## parameters, see the tinproxy.conf(5) manual page. +## + +# +# User/Group: This allows you to set the user and group that will be +# used for tinyproxy after the initial binding to the port has been done +# as the root user. Either the user or group name or the UID or GID +# number may be used. +# +User tinyproxy +Group nogroup + +# +# Port: Specify the port which tinyproxy will listen on. Please note +# that should you choose to run on a port lower than 1024 you will need +# to start tinyproxy using root. +# +Port 8888 + +# +# Listen: If you have multiple interfaces this allows you to bind to +# only one. If this is commented out, tinyproxy will bind to all +# interfaces present. +# +#Listen 192.168.0.1 + +# +# Bind: This allows you to specify which interface will be used for +# outgoing connections. This is useful for multi-home'd machines where +# you want all traffic to appear outgoing from one particular interface. +# +#Bind 192.168.0.1 + +# +# BindSame: If enabled, tinyproxy will bind the outgoing connection to the +# ip address of the incoming connection. +# +#BindSame yes + +# +# Timeout: The maximum number of seconds of inactivity a connection is +# allowed to have before it is closed by tinyproxy. +# +Timeout 600 + +# +# ErrorFile: Defines the HTML file to send when a given HTTP error +# occurs. You will probably need to customize the location to your +# particular install. The usual locations to check are: +# /usr/local/share/tinyproxy +# /usr/share/tinyproxy +# /etc/tinyproxy +# +#ErrorFile 404 "/usr/share/tinyproxy/404.html" +#ErrorFile 400 "/usr/share/tinyproxy/400.html" +#ErrorFile 503 "/usr/share/tinyproxy/503.html" +#ErrorFile 403 "/usr/share/tinyproxy/403.html" +#ErrorFile 408 "/usr/share/tinyproxy/408.html" + +# +# DefaultErrorFile: The HTML file that gets sent if there is no +# HTML file defined with an ErrorFile keyword for the HTTP error +# that has occured. +# +DefaultErrorFile "/usr/share/tinyproxy/default.html" + +# +# StatHost: This configures the host name or IP address that is treated +# as the stat host: Whenever a request for this host is received, +# Tinyproxy will return an internal statistics page instead of +# forwarding the request to that host. The default value of StatHost is +# tinyproxy.stats. +# +#StatHost "tinyproxy.stats" +# + +# +# StatFile: The HTML file that gets sent when a request is made +# for the stathost. If this file doesn't exist a basic page is +# hardcoded in tinyproxy. +# +StatFile "/usr/share/tinyproxy/stats.html" + +# +# LogFile: Allows you to specify the location where information should +# be logged to. If you would prefer to log to syslog, then disable this +# and enable the Syslog directive. These directives are mutually +# exclusive. +# +#LogFile "/var/log/tinyproxy/tinyproxy.log" + +# +# Syslog: Tell tinyproxy to use syslog instead of a logfile. This +# option must not be enabled if the Logfile directive is being used. +# These two directives are mutually exclusive. +# +#Syslog On + +# +# LogLevel: +# +# Set the logging level. Allowed settings are: +# Critical (least verbose) +# Error +# Warning +# Notice +# Connect (to log connections without Info's noise) +# Info (most verbose) +# +# The LogLevel logs from the set level and above. For example, if the +# LogLevel was set to Warning, then all log messages from Warning to +# Critical would be output, but Notice and below would be suppressed. +# +LogLevel Info + +# +# PidFile: Write the PID of the main tinyproxy thread to this file so it +# can be used for signalling purposes. +# +PidFile "/var/run/tinyproxy/tinyproxy.pid" + +# +# XTinyproxy: Tell Tinyproxy to include the X-Tinyproxy header, which +# contains the client's IP address. +# +#XTinyproxy Yes + +# +# Upstream: +# +# Turns on upstream proxy support. +# +# The upstream rules allow you to selectively route upstream connections +# based on the host/domain of the site being accessed. +# +# For example: +# # connection to test domain goes through testproxy +# upstream testproxy:8008 ".test.domain.invalid" +# upstream testproxy:8008 ".our_testbed.example.com" +# upstream testproxy:8008 "192.168.128.0/255.255.254.0" +# +# # no upstream proxy for internal websites and unqualified hosts +# no upstream ".internal.example.com" +# no upstream "www.example.com" +# no upstream "10.0.0.0/8" +# no upstream "192.168.0.0/255.255.254.0" +# no upstream "." +# +# # connection to these boxes go through their DMZ firewalls +# upstream cust1_firewall:8008 "testbed_for_cust1" +# upstream cust2_firewall:8008 "testbed_for_cust2" +# +# # default upstream is internet firewall +# upstream firewall.internal.example.com:80 +# +# The LAST matching rule wins the route decision. As you can see, you +# can use a host, or a domain: +# name matches host exactly +# .name matches any host in domain "name" +# . matches any host with no domain (in 'empty' domain) +# IP/bits matches network/mask +# IP/mask matches network/mask +# +#Upstream some.remote.proxy:port + +# +# MaxClients: This is the absolute highest number of threads which will +# be created. In other words, only MaxClients number of clients can be +# connected at the same time. +# +MaxClients 100 + +# +# MinSpareServers/MaxSpareServers: These settings set the upper and +# lower limit for the number of spare servers which should be available. +# +# If the number of spare servers falls below MinSpareServers then new +# server processes will be spawned. If the number of servers exceeds +# MaxSpareServers then the extras will be killed off. +# +MinSpareServers 5 +MaxSpareServers 20 + +# +# StartServers: The number of servers to start initially. +# +StartServers 10 + +# +# MaxRequestsPerChild: The number of connections a thread will handle +# before it is killed. In practise this should be set to 0, which +# disables thread reaping. If you do notice problems with memory +# leakage, then set this to something like 10000. +# +MaxRequestsPerChild 0 + +# +# Allow: Customization of authorization controls. If there are any +# access control keywords then the default action is to DENY. Otherwise, +# the default action is ALLOW. +# +# The order of the controls are important. All incoming connections are +# tested against the controls based on order. +# +Allow 127.0.0.1 + +# +# AddHeader: Adds the specified headers to outgoing HTTP requests that +# Tinyproxy makes. Note that this option will not work for HTTPS +# traffic, as Tinyproxy has no control over what headers are exchanged. +# +#AddHeader "X-My-Header" "Powered by Tinyproxy" + +# +# ViaProxyName: The "Via" header is required by the HTTP RFC, but using +# the real host name is a security concern. If the following directive +# is enabled, the string supplied will be used as the host name in the +# Via header; otherwise, the server's host name will be used. +# +ViaProxyName "tinyproxy" + +# +# DisableViaHeader: When this is set to yes, Tinyproxy does NOT add +# the Via header to the requests. This virtually puts Tinyproxy into +# stealth mode. Note that RFC 2616 requires proxies to set the Via +# header, so by enabling this option, you break compliance. +# Don't disable the Via header unless you know what you are doing... +# +#DisableViaHeader Yes + +# +# Filter: This allows you to specify the location of the filter file. +# +#Filter "/etc/filter" + +# +# FilterURLs: Filter based on URLs rather than domains. +# +#FilterURLs On + +# +# FilterExtended: Use POSIX Extended regular expressions rather than +# basic. +# +#FilterExtended On + +# +# FilterCaseSensitive: Use case sensitive regular expressions. +# +#FilterCaseSensitive On + +# +# FilterDefaultDeny: Change the default policy of the filtering system. +# If this directive is commented out, or is set to "No" then the default +# policy is to allow everything which is not specifically denied by the +# filter file. +# +# However, by setting this directive to "Yes" the default policy becomes +# to deny everything which is _not_ specifically allowed by the filter +# file. +# +#FilterDefaultDeny Yes + +# +# Anonymous: If an Anonymous keyword is present, then anonymous proxying +# is enabled. The headers listed are allowed through, while all others +# are denied. If no Anonymous keyword is present, then all headers are +# allowed through. You must include quotes around the headers. +# +# Most sites require cookies to be enabled for them to work correctly, so +# you will need to allow Cookies through if you access those sites. +# +#Anonymous "Host" +#Anonymous "Authorization" +#Anonymous "Cookie" + +# +# ConnectPort: This is a list of ports allowed by tinyproxy when the +# CONNECT method is used. To disable the CONNECT method altogether, set +# the value to 0. If no ConnectPort line is found, all ports are +# allowed (which is not very secure.) +# +# The following two ports are used by SSL. +# +ConnectPort 443 +ConnectPort 563 + +# +# Configure one or more ReversePath directives to enable reverse proxy +# support. With reverse proxying it's possible to make a number of +# sites appear as if they were part of a single site. +# +# If you uncomment the following two directives and run tinyproxy +# on your own computer at port 8888, you can access Google using +# http://localhost:8888/google/ and Wired News using +# http://localhost:8888/wired/news/. Neither will actually work +# until you uncomment ReverseMagic as they use absolute linking. +# +#ReversePath "/google/" "http://www.google.com/" +#ReversePath "/wired/" "http://www.wired.com/" + +# +# When using tinyproxy as a reverse proxy, it is STRONGLY recommended +# that the normal proxy is turned off by uncommenting the next directive. +# +#ReverseOnly Yes + +# +# Use a cookie to track reverse proxy mappings. If you need to reverse +# proxy sites which have absolute links you must uncomment this. +# +#ReverseMagic Yes + +# +# The URL that's used to access this reverse proxy. The URL is used to +# rewrite HTTP redirects so that they won't escape the proxy. If you +# have a chain of reverse proxies, you'll need to put the outermost +# URL here (the address which the end user types into his/her browser). +# +# If not set then no rewriting occurs. +# +#ReverseBaseURL "http://localhost:8888/" + + + diff --git a/meta-openembedded/meta-networking/recipes-support/tinyproxy/tinyproxy/tinyproxy.service b/meta-openembedded/meta-networking/recipes-support/tinyproxy/tinyproxy/tinyproxy.service index df4274573..78df437f6 100644 --- a/meta-openembedded/meta-networking/recipes-support/tinyproxy/tinyproxy/tinyproxy.service +++ b/meta-openembedded/meta-networking/recipes-support/tinyproxy/tinyproxy/tinyproxy.service @@ -3,12 +3,12 @@ Description=Tinyproxy, Lightweight http(s) proxy daemon RequiresMountsFor=/var [Service] -Group=tinyproxy ExecStartPre=/bin/mkdir -p /var/log/tinyproxy -ExecStartPre=/bin/chown -R nobody.tinyproxy /var/log/tinyproxy +ExecStartPre=/bin/chown -R tinyproxy.nogroup /var/log/tinyproxy ExecStartPre=/bin/mkdir -p /var/run/tinyproxy -ExecStartPre=/bin/chown -R nobody.tinyproxy /var/run/tinyproxy +ExecStartPre=/bin/chown -R tinyproxy.nogroup /var/run/tinyproxy ExecStart=/usr/bin/tinyproxy -d +PIDFile=/var/run/tinyproxy/tinyproxy.pid [Install] WantedBy=multi-user.target diff --git a/meta-openembedded/meta-networking/recipes-support/tinyproxy/tinyproxy_1.10.0.bb b/meta-openembedded/meta-networking/recipes-support/tinyproxy/tinyproxy_1.10.0.bb index 144dcf33a..7d97f52a7 100644 --- a/meta-openembedded/meta-networking/recipes-support/tinyproxy/tinyproxy_1.10.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/tinyproxy/tinyproxy_1.10.0.bb @@ -4,8 +4,10 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.gz \ - file://disable-documentation.patch \ - file://tinyproxy.service" + file://disable-documentation.patch \ + file://tinyproxy.service \ + file://tinyproxy.conf \ + " SRC_URI[md5sum] = "423047c8dc53a15e19f78e238198549c" SRC_URI[sha256sum] = "6020955e6a0ef0ef898ad5bb17a448c47f9e4c003c464b4ae7c4dba063272055" @@ -23,7 +25,7 @@ inherit autotools systemd useradd #User specific USERADD_PACKAGES = "${PN}" USERADD_PARAM_${PN} = "--system --home /dev/null \ - --no-user-group --gid nogroup tinypoxy" + --no-user-group --gid nogroup tinyproxy" SYSTEMD_PACKAGES += "${BPN}" SYSTEMD_SERVICE_${PN} = "tinyproxy.service" @@ -34,4 +36,5 @@ do_install_append() { install -d ${D}${systemd_system_unitdir} install -m 0644 ${WORKDIR}/tinyproxy.service ${D}${systemd_system_unitdir} fi + install -m 0644 ${WORKDIR}/tinyproxy.conf ${D}${sysconfdir}/tinyproxy.conf } diff --git a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.0.6.bb b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.2.0.bb index ccaa0c94a..df46b3326 100644 --- a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.0.6.bb +++ b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.2.0.bb @@ -12,14 +12,14 @@ SRC_URI = "https://1.eu.dl.wireshark.org/src/all-versions/wireshark-${PV}.tar.xz UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src" -SRC_URI[md5sum] = "c6f8d12a3efe21cc7885f7cb0c4bd938" -SRC_URI[sha256sum] = "a87f4022a0c15ddbf1730bf1acafce9e75a4e657ce9fa494ceda0324c0c3e33e" +SRC_URI[md5sum] = "259915adbbaded15de075afe7b4b03b6" +SRC_URI[sha256sum] = "4cfd33a19a454ff4002243e9d04d6afd64280a109a21ae652a192f2be2b1b66c" PE = "1" inherit cmake pkgconfig python3native perlnative upstream-version-is-even -PACKAGECONFIG ?= "libpcap gnutls libnl libcap sbc ${@bb.utils.contains('BBFILE_COLLECTIONS', 'qt5-layer', 'qt5', '', d)}" +PACKAGECONFIG ?= "libpcap gnutls libnl libcap sbc ${@bb.utils.contains('BBFILE_COLLECTIONS', 'qt5-layer', 'qt5 plugins', '', d)}" PACKAGECONFIG_class-native = "libpcap gnutls ssl libssh" |