diff options
| author | Andrew Geissler <geissonator@yahoo.com> | 2020-12-01 04:55:29 +0300 |
|---|---|---|
| committer | Andrew Geissler <geissonator@yahoo.com> | 2020-12-01 18:27:19 +0300 |
| commit | 4b7c115404e4e18ca796c16a64c04ba299bf5cd0 (patch) | |
| tree | aa5cf8759c4a5e15cc12e8795aa189b8e2d02b4a /meta-openembedded/meta-networking/recipes-support | |
| parent | 6ce62a20847b1bd500386c842cf8b801b678bd1c (diff) | |
| download | openbmc-4b7c115404e4e18ca796c16a64c04ba299bf5cd0.tar.xz | |
meta-openembedded: subtree update:164a6030b0..f623d8b574
Adrian Freihofer (1):
paho-mqtt-c: upgrade 1.3.6 -> 1.3.7
Alexander Kamensky (2):
makedumpfile: add PACKAGECONFIG options for lzo and snappy compression
makedumpfile: upgrade 1.6.7 -> 1.6.8
Alexander Kanavin (4):
collect: do not build with -Werror
libsigrokdecode: add python 3.9 support
python3-mprpc: remove the recipe
gnome-calendar: update to 3.38.1, add libhandy 1.x support
Anatol Belski (1):
chrony: Patch CVE-2020-14367
Bartosz Golaszewski (1):
libgpiod: update v1.4.4 -> v1.4.5
Beni (1):
unbound: upgrade to 1.12.0
Gregory Anders (5):
Add suitesparse
Add python3-transitions
Add python3-dill
Add python3-cerberus
Add python3-cvxopt
Hongxu Jia (1):
lvm2.inc: switch branch master to main
Jasper Orschulko (1):
upgrade and de-blacklist nanopb recipe
Jose Quaresma (3):
spirv-tools: moved into OE-core, delete from meta-oe
srt: add receipe
opencv: Update 4.4.0 -> 4.5.0
Kai Kang (4):
xfce4-cpufreq-plugin: 1.2.1 -> 1.2.2
xfce4-weather-plugin: 0.10.1 -> 0.10.2
xfce4-mailwatch-plugin: 1.2.0 -> 1.3.0
tumbler: 0.2.9 -> 0.3.1
Khem Raj (71):
nodejs: Fix arm32/thumb builds with clang
nodejs: Update to 12.19.0
redis: Fix build on 32bit targets and clang
gperftools: Fix build with new musl updates
minifi-cpp: Fix build with riscv64/clang
graphviz: Upgrade to 2.44.1 release
musl-nscd: Update to latest
remmina: Update to 1.4.8
mdbus2: Fix build with vala 0.50
ibus: Update to 1.5.3 plus fix for vala 0.50
networkd-dispatcher: Upgrade to 2.1
geoclue: Use git fetcher
kernel-selftest: Disable vm packageconfig for riscv
layer.conf: Add hardknott to LAYERSERIES_COMPAT
fmt: Upgrade to 7.1.2
lksctp-tools: Update to latest master
fuse3: Upgrade to 3.10.0
rdma-core: Upgrade to 31.1
opengl-es-cts: Disable LTO
fluentbit: Disable LTO
traceroute: Fix build with LTO
cmocka: Fix buils with LTO
dovecot: Disable LTO
redis-plus-plus: Upgrade to 1.2.1
suitesparse: Exclude from world
python3-icu: Update to 2.6
meta-python: Drop RDEPEND'ing on python3-typing
python3-cvxopt: Exclude from world builds
packagegroup-meta-multimedia: Add srt
gedit: Inherit python3targetconfig
gmime: Fix append to do_configure
dconf: Add leading whitespace for append operator
kexec-tools-klibc: Add leading whitespace for append operator
spice: Add leading whitespace for append operator
meta-oe: Add leading whitespace for append operator
libgusb: Update to 0.3.5
botan: Mark incompatible with riscv32
projucer: Link with libatomic on rv32
mariadb: Fix build on 32bit arches with 64bit time_t
liburing: Fix build on 32-bit arches with 64-bit time_t
librtorrent: Disable instrumentation on rv32
ntopng: Link with libatomic on rv32
poco: Add riscv32 support
capnproto: Fix build on 32bit arches with 64bit time_t defaults
directfb: Fix build on riscv32
opensaf: Fix build on 32bit arches with 64bit time_t e.g. RISCV-32
rocksdb: Update to 6.12.7
qpdf: Link with libatomic on rv32
libkcapi: Fix build on riscv32
jack: Upgrade to 1.19.16
vlc: Fix build on riscv32
fluentbit: Link with libatomic on riscv32
openipmi: Inherit python3targetconfig
libplist: Inherit python3targetconfig
postgresql: Inherit python3targetconfig
python-grpcio-tools: Add missing space for append
python3-pykwalify: Do not unset _PYTHON_SYSCONFIGDATA_NAME
thingsboard-gateway: Move under dynamic layers
musl-nscd: Replace -fcommon with code patch
musl-nscd: Add missing deps on flex and bison during build
python3-pytest: Upgrade to 6.1.2
python3-hypothesis: Add recipe
python3-sortedcontainers: Add recipe
heaptrack: Fix build on musl
heaptrack: Mark RISCV host incompatible
packagegroup-meta-oe: Exclude heaptrack for rv32/rv64
chrony: Upgrade to 4.0
canutils,can-utils: Add cansequence to u-a as well
packagegroup-meta-python: Add newly added recipes to packagegroup-meta-python3
pipewire: Link with libatomic for riscv32
python3-matplotlib: Disable LTO for clang/riscv
Kory Maincent (1):
libftdi: add swig-native to dependencies
Leon Anavi (37):
python3-luma-oled: Upgrade 3.6.0 -> 3.7.0
python3-cryptography-vectors: Upgrade 3.1.1 -> 3.2
python3-pyexpect: Upgrade 1.0.20 -> 1.0.21
python3-markdown: Upgrade 3.3.2 -> 3.3.3
python3-sh: Upgrade 1.14.0 -> 1.14.1
python3-kiwisolver: Upgrade 1.2.0 -> 1.3.0
python3-aiohttp: Upgrade 3.7.1 -> 3.7.2
python3-aiofiles: Upgrade 0.5.0 -> 0.6.0
python3-regex: Upgrade 2020.10.23 -> 2020.10.28
python3-dateparser: Upgrade 0.7.6 -> 1.0.0
python3-langtable: Upgrade 0.0.53 -> 0.0.54
python3-kiwisolver: Upgrade 1.3.0 -> 1.3.1
python3-tornado: Upgrade 6.0.4 -> 6.1
python3-ipython: Upgrade 7.18.1 -> 7.19.0
python3-cmd2: Upgrade 1.3.11 -> 1.4.0
python3-dill: Upgrade 0.3.2 -> 0.3.3
python3-colorlog: Upgrade 4.4.0 -> 4.6.2
python3-pandas: Upgrade 1.1.3 -> 1.1.4
python3-attrs: 20.2.0 -> 20.3.0
python3-gmqtt: Upgrade 0.6.7 -> 0.6.8
python3-diskcache: Upgrade 5.0.3 -> 5.1.0
python3-croniter: Upgrade 0.3.35 -> 0.3.36
python3-bitarray: Upgrade 1.6.0 -> 1.6.1
python3-certifi: Upgrade 2020.6.20 -> 2020.11.8
python3-cantools: Upgrade 35.3.0 -> 35.5.0
python3-arpeggio: Upgrade 1.9.2 -> 1.10.1
python3-toml: Upgrade 0.10.1 -> 0.10.2
python3-pyrad: Upgrade 2.3 -> 2.4
python3-bitstruct: Upgrade 8.11.0 -> 8.11.1
python3-yarl: Upgrade 1.6.2 -> 1.6.3
python3-luma-core: Upgrade 1.17.3 -> 2.0.1
python3-luma-oled: Upgrade 3.7.0 -> 3.8.1
python3-fastnumbers: Upgrade 3.0.0 -> 3.1.0
python3-ansi2html: Upgrade 1.5.2 -> 1.6.0
python3-prettytable: Upgrade 1.0.1 -> 2.0.0
python3-urllib3: Upgrade 1.25.11 -> 1.26.2
python3-transitions: Upgrade 0.8.4 -> 0.8.5
Li Zhou (1):
ptpd: Solve memory leak for function NTPDCrequest
Maciej Pijanowski (2):
cdrkit: add native to BBCLASSEXTEND
cdrkit: split into more packages
Mark Jonas (5):
mbedtls: Fix typo in PACKAGECONFIG
python3-pyinotify: Add missing ctypes dependency
libsocketcan: Add PACKAGECONFIG options
libsocketcan: Update to 0.0.12
imagemagick: Add NOTICE to collected license texts
Max Kellermann (1):
php: remove the failing ${D}/${TMPDIR} code
Mingli Yu (6):
ndpi: add new recipe
libmaxminddb: add new recipe
ntopng: add new recipe
ntop: remove the recipe
packagegroup-meta-networking.bb: add ntopng related recipes
traceroute: set VPATH
Nick Rosbrook (3):
strongswan: add some PACKAGECONFIG options for EAP
strongswan: do not use deprecated stroke and starter by default
strongswan: remove ldap from default PACKAGECONFIG
Pierre-Jean Texier (1):
inotify-tools: upgrade 3.20.2.2 -> 3.20.11.0
Randy Witt (1):
numactl: Remove the recipe
Ricardo Salveti (3):
wireguard-module: upgrade 1.0.20200712 -> 1.0.20200908
wireguard-tools: upgrade 1.0.20200513 -> 1.0.20200827
wireguard-module: upgrade 1.0.20200908 -> 1.0.20201112
Sakib Sajal (1):
libssh2: fix ptest
Sinan Kaya (3):
collectd: fix the test condition for dash compatibility
heaptrack: add bitbake recipe
cpp-netlib: add bitbake recipe
Tim Orling (16):
python3-atomicwrites: drop (moved to oe-core)
python3-attrs: drop (moved to oe-core)
python3-iniconfig: drop (moved to oe-core)
python3-more-itertools: drop (moved to oe-core)
python3-pathlib2: drop (moved to oe-core)
python3-toml: drop (moved to oe-core)
python3-py: drop (moved to oe-core)
python3-setuptools-scm: drop (moved to oe-core)
python3-packaging: drop (moved to oe-core)
python3-wcwidth: drop (moved to oe-core)
python3-zipp: drop (moved to oe-core)
python3-importlib-metadata: drop (moved to oe-core)
python3-pluggy: drop (moved to oe-core)
python3-pytest: drop (moved to oe-core)
python3-hypothesis: drop (moved to oe-core)
python3-sortedcontainers: drop (moved to oe-core)
Trevor Gamblin (2):
python3-jinja2: Fix ptest RDEPENDS and file installation
python3-markupsafe: Fix ptest RDEPENDS and installation
William A. Kennington III (1):
span-lite: Bump e03d116..0.8.1
Yi Zhao (5):
minifi-cpp: specify GCC_AR and GCC_RANLIB
quagga: unify volatiles file name
minifi-cpp: depend on nettle and lz4
nss: upgrade 3.57 -> 3.59
krb5: upgrade 1.17.1 -> 1.17.2
Zang Ruochen (19):
libnftnl: upgrade 1.1.7 -> 1.1.8
xfsprogs: upgrade 5.8.0 -> 5.9.0
radvd: upgrade 2.18 -> 2.19
fmt: upgrade 7.0.3 -> 7.1.0
hidapi: upgrade 0.9.0 -> 0.10.0
libkcapi: upgrade 1.2.0 -> 1.2.1
modemmanager: upgrade 1.14.2 -> 1.14.6
nvme-cli: upgrade 1.12 -> 1.13
ostree: upgrade 2020.6 -> 2020.7
poppler-data: upgrade 0.4.9 -> 0.4.10
nftables: upgrade 0.9.6 -> 0.9.7
toybox: upgrade 0.8.3 -> 0.8.4
fbgrab: upgrade 1.3.3 -> 1.4
mraa: upgrade 2.1.0 -> 2.2.0
opensaf: upgrade 5.20.05 -> 5.20.08
openvpn: upgrade 2.4.9 -> 2.5.0
poppler: upgrade 20.10.0 -> 20.11.0
tmux: upgrade 3.1b -> 3.1c
xmlsec1: upgrade 1.2.30 -> 1.2.31
changqing.li@windriver.com (1):
thin-provisioning-tools: switch branch from master to main
hasan.men (2):
thingsboard-gateway: Add recipe for v2.5.2
python3-jsonpath-rw: Add recipe for v1.4.0
richard (1):
poco: Upgrade 1.9.4 -> 1.10.1
viatsk (1):
tcpdump: Patch for CVE-2020-8037
zangrc (27):
sshfs-fuse: upgrade 3.7.0 -> 3.7.1
can-utils: upgrade 2020.02.04 -> 2020.11.0
hwdata: upgrade 0.340 -> 0.341
libio-pty-perl: upgrade 1.14 -> 1.15
live555: upgrade 20200819 -> 20201105
zile: upgrade 2.4.14 -> 2.4.15
rdma-core: upgrade 31.1 -> 32.0
strongswan: upgrade 5.8.4 -> 5.9.1
fio: upgrade 3.22 -> 3.24
libharu: Fix the packaging bug
modemmanager: upgrade 1.14.6 -> 1.14.8
openldap: upgrade 2.4.51 -> 2.4.56
protobuf: upgrade 3.13.0.1 -> 3.14.0
nghttp2: upgrade 2.41.0 -> 2.42.0
nngpp: upgrade 1.2.4 -> 1.3.0
snort: upgrade 2.9.16.1 -> 2.9.17
weechat: upgrade 2.9 -> 3.0
cjson: upgrade 1.7.13 -> 1.7.14
cloc: upgrade 1.84 -> 1.88
jpnevulator: upgrade 2.3.5 -> 2.3.6
libjcat: upgrade 0.1.3 -> 0.1.4
libsigc++-3: upgrade 3.0.3 -> 3.0.6
ocl-icd: upgrade 2.2.12 -> 2.2.13
opencl-clhpp: upgrade 2.0.11 -> 2.0.12
ostree: upgrade 2020.7 -> 2020.8
pkcs11-helper: upgrade 1.26 -> 1.27
netplan: upgrade 0.99 -> 0.100
zhengruoqin (1):
dnf-plugin-tui: Update to the latest version
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I286bb6d58bf30588516b35ec06ddfd0bedee2e64
Diffstat (limited to 'meta-openembedded/meta-networking/recipes-support')
48 files changed, 617 insertions, 1649 deletions
diff --git a/meta-openembedded/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch b/meta-openembedded/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch index 187898a6e..97b44dc7a 100644 --- a/meta-openembedded/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch +++ b/meta-openembedded/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch @@ -18,45 +18,60 @@ Subject: [PATCH] chrony: fix build failure for arma9 Refresh patch for new upstream version. Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org> + + Refreshed for 4.0 + + Signed-off-by: Khem Raj <raj.khem@gmail.com> --- sys_linux.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) -diff --git a/sys_linux.c b/sys_linux.c -index 898dc7a..b268ad1 100644 --- a/sys_linux.c +++ b/sys_linux.c -@@ -479,14 +479,14 @@ SYS_Linux_EnableSystemCallFilter(int level) - const int syscalls[] = { - /* Clock */ - SCMP_SYS(adjtimex), SCMP_SYS(clock_gettime), SCMP_SYS(gettimeofday), -- SCMP_SYS(settimeofday), SCMP_SYS(time), -+ SCMP_SYS(settimeofday), +@@ -499,14 +499,12 @@ SYS_Linux_EnableSystemCallFilter(int lev + #endif + SCMP_SYS(gettimeofday), + SCMP_SYS(settimeofday), +- SCMP_SYS(time), + /* Process */ - SCMP_SYS(clone), SCMP_SYS(exit), SCMP_SYS(exit_group), SCMP_SYS(getpid), -- SCMP_SYS(getrlimit), SCMP_SYS(rt_sigaction), SCMP_SYS(rt_sigreturn), -+ SCMP_SYS(rt_sigaction), SCMP_SYS(rt_sigreturn), - SCMP_SYS(rt_sigprocmask), SCMP_SYS(set_tid_address), SCMP_SYS(sigreturn), - SCMP_SYS(wait4), SCMP_SYS(waitpid), + SCMP_SYS(clone), + SCMP_SYS(exit), + SCMP_SYS(exit_group), + SCMP_SYS(getpid), +- SCMP_SYS(getrlimit), + SCMP_SYS(getuid), + SCMP_SYS(rt_sigaction), + SCMP_SYS(rt_sigreturn), +@@ -519,7 +517,6 @@ SYS_Linux_EnableSystemCallFilter(int lev /* Memory */ -- SCMP_SYS(brk), SCMP_SYS(madvise), SCMP_SYS(mmap), SCMP_SYS(mmap2), -+ SCMP_SYS(brk), SCMP_SYS(madvise), SCMP_SYS(mmap2), - SCMP_SYS(mprotect), SCMP_SYS(mremap), SCMP_SYS(munmap), SCMP_SYS(shmdt), - /* Filesystem */ - SCMP_SYS(_llseek), SCMP_SYS(access), SCMP_SYS(chmod), SCMP_SYS(chown), -@@ -499,14 +499,22 @@ SYS_Linux_EnableSystemCallFilter(int level) - SCMP_SYS(bind), SCMP_SYS(connect), SCMP_SYS(getsockname), SCMP_SYS(getsockopt), - SCMP_SYS(recv), SCMP_SYS(recvfrom), SCMP_SYS(recvmmsg), SCMP_SYS(recvmsg), - SCMP_SYS(send), SCMP_SYS(sendmmsg), SCMP_SYS(sendmsg), SCMP_SYS(sendto), + SCMP_SYS(brk), + SCMP_SYS(madvise), +- SCMP_SYS(mmap), + SCMP_SYS(mmap2), + SCMP_SYS(mprotect), + SCMP_SYS(mremap), +@@ -573,8 +570,6 @@ SYS_Linux_EnableSystemCallFilter(int lev + SCMP_SYS(sendmsg), + SCMP_SYS(sendto), + SCMP_SYS(shutdown), - /* TODO: check socketcall arguments */ - SCMP_SYS(socketcall), + /* General I/O */ - SCMP_SYS(_newselect), SCMP_SYS(close), SCMP_SYS(open), SCMP_SYS(openat), SCMP_SYS(pipe), - SCMP_SYS(pipe2), SCMP_SYS(poll), SCMP_SYS(ppoll), SCMP_SYS(pselect6), SCMP_SYS(read), -- SCMP_SYS(futex), SCMP_SYS(select), SCMP_SYS(set_robust_list), SCMP_SYS(write), -+ SCMP_SYS(futex), SCMP_SYS(set_robust_list), SCMP_SYS(write), - /* Miscellaneous */ - SCMP_SYS(getrandom), SCMP_SYS(sysinfo), SCMP_SYS(uname), + SCMP_SYS(_newselect), +@@ -597,7 +592,6 @@ SYS_Linux_EnableSystemCallFilter(int lev + #ifdef __NR_futex_time64 + SCMP_SYS(futex_time64), + #endif +- SCMP_SYS(select), + SCMP_SYS(set_robust_list), + SCMP_SYS(write), + +@@ -605,6 +599,15 @@ SYS_Linux_EnableSystemCallFilter(int lev + SCMP_SYS(getrandom), + SCMP_SYS(sysinfo), + SCMP_SYS(uname), + /* not always available */ +#if ! defined(__ARM_EABI__) + SCMP_SYS(time), @@ -66,10 +81,6 @@ index 898dc7a..b268ad1 100644 + /* TODO: check socketcall arguments */ + SCMP_SYS(socketcall), +#endif -+ }; - - const int socket_domains[] = { --- -2.17.1 + const int socket_domains[] = { diff --git a/meta-openembedded/meta-networking/recipes-support/chrony/chrony/chronyd b/meta-openembedded/meta-networking/recipes-support/chrony/chrony/chronyd index 04f1b681c..8c7c167b3 100644 --- a/meta-openembedded/meta-networking/recipes-support/chrony/chrony/chronyd +++ b/meta-openembedded/meta-networking/recipes-support/chrony/chrony/chronyd @@ -15,7 +15,7 @@ PATH=/sbin:/bin:/usr/bin:/usr/sbin DAEMON=/usr/sbin/chronyd -PIDFILE=/var/run/chronyd.pid +PIDFILE=/run/chrony/chronyd.pid test -x $DAEMON -a -r /etc/chrony.conf || exit 0 diff --git a/meta-openembedded/meta-networking/recipes-support/chrony/chrony_3.5.bb b/meta-openembedded/meta-networking/recipes-support/chrony/chrony_4.0.bb index 7c6356d26..c8987013b 100644 --- a/meta-openembedded/meta-networking/recipes-support/chrony/chrony_3.5.bb +++ b/meta-openembedded/meta-networking/recipes-support/chrony/chrony_4.0.bb @@ -39,8 +39,7 @@ SRC_URI = "https://download.tuxfamily.org/chrony/chrony-${PV}.tar.gz \ SRC_URI_append_libc-musl = " \ file://0001-Fix-compilation-with-musl.patch \ " -SRC_URI[md5sum] = "5f66338bc940a9b51eede8f391e7bed3" -SRC_URI[sha256sum] = "4e02795b1260a4ec51e6ace84149036305cc9fc340e65edb9f8452aa611339b5" +SRC_URI[sha256sum] = "be27ea14c55e7a4434b2fa51d53018c7051c42fa6a3198c9aa6a1658bae0c625" DEPENDS = "pps-tools" @@ -81,6 +80,10 @@ DISABLE_STATIC = "" do_configure() { ./configure --sysconfdir=${sysconfdir} --bindir=${bindir} --sbindir=${sbindir} \ --localstatedir=${localstatedir} --datarootdir=${datadir} \ + --with-ntp-era=$(shell date -d '1970-01-01 00:00:00+00:00' +'%s') \ + --with-pidfile=/run/chrony/chronyd.pid \ + --chronyrundir=/run/chrony \ + --host-system=Linux \ ${PACKAGECONFIG_CONFARGS} } @@ -106,9 +109,6 @@ do_install() { # Variable data (for drift and/or rtc file) install -d ${D}${localstatedir}/lib/chrony - # Log files - install -d ${D}${localstatedir}/log/chrony - # Fix hard-coded paths in config files and init scripts sed -i -e 's!/var/!${localstatedir}/!g' -e 's!/etc/!${sysconfdir}/!g' \ -e 's!/usr/sbin/!${sbindir}/!g' -e 's!/usr/bin/!${bindir}/!g' \ @@ -119,7 +119,7 @@ do_install() { sed -i 's!^EnvironmentFile=.*!EnvironmentFile=-${sysconfdir}/default/chronyd!' ${D}${systemd_unitdir}/system/chronyd.service } -FILES_${PN} = "${sbindir}/chronyd ${sysconfdir} ${localstatedir}" +FILES_${PN} = "${sbindir}/chronyd ${sysconfdir} ${localstatedir}/lib/chrony ${localstatedir}" CONFFILES_${PN} = "${sysconfdir}/chrony.conf" INITSCRIPT_NAME = "chronyd" INITSCRIPT_PARAMS = "defaults" diff --git a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.2.36.4.bb b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.2.36.4.bb index 0f7fad2b2..bda174023 100644 --- a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.2.36.4.bb +++ b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.2.36.4.bb @@ -44,6 +44,10 @@ CACHED_CONFIGUREVARS += "i_cv_signed_size_t=no \ EXTRA_OECONF = " --with-ioloop=epoll \ --with-systemdsystemunitdir=${systemd_unitdir}/system" +# Uses hidden symbols +# libssl_iostream_openssl.so: undefined reference to `ssl_iostream_handshake' +LTO = "" + SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE_${PN} = "dovecot.service dovecot.socket" SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-openembedded/meta-networking/recipes-support/libmaxminddb/libmaxminddb_1.4.3.bb b/meta-openembedded/meta-networking/recipes-support/libmaxminddb/libmaxminddb_1.4.3.bb new file mode 100644 index 000000000..204148e63 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/libmaxminddb/libmaxminddb_1.4.3.bb @@ -0,0 +1,18 @@ +SUMMARY = "C library for the MaxMind DB file format" +DESCRIPTION = "The libmaxminddb library provides a C library for reading MaxMind DB files, \ +ncluding the GeoIP2 databases from MaxMind. This is a custom binary \ +format designed to facilitate fast lookups of IP addresses while allowing \ +for great flexibility in the type of data associated with an address." + +HOMEPAGE = "https://github.com/maxmind/libmaxminddb" +SECTION = "libs" +LICENSE = " Apache-2.0" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ +" +SRC_URI = "https://github.com/maxmind/libmaxminddb/releases/download/${PV}/${BPN}-${PV}.tar.gz \ +" +SRC_URI[sha256sum] = "a5fdf6c7b4880fdc7620f8ace5bd5cbe9f65650c9493034b5b9fc7d83551a439" + +inherit autotools-brokensep + diff --git a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-0b0dce7a36fb-actually-belongs-to-v4.19.patch b/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-0b0dce7a36fb-actually-belongs-to-v4.19.patch deleted file mode 100644 index 7599b1bcf..000000000 --- a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-0b0dce7a36fb-actually-belongs-to-v4.19.patch +++ /dev/null @@ -1,31 +0,0 @@ -From e5952a0cdfa8b1b56a5823574835f1f771f14ae0 Mon Sep 17 00:00:00 2001 -From: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> -Date: Fri, 24 Aug 2018 09:53:00 -0300 -Subject: [PATCH] build: 0b0dce7a36fb actually belongs to v4.19 - -Typo or not, this commit actually belongs to v4.19 and made me wonder why -on v4.18 it didn't find this feature. - -Fixes: 817f0bfa248f ("build: add two defines for Peer Address Parameters extensions on sctp_paddrparams") -Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> -Reviewed-by: Xin Long <lucien.xin@gmail.com> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index f55775a..5de5c76 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -101,7 +101,7 @@ LKSCTP_CHECK_TYPE([struct sctp_prinfo], [HAVE_SCTP_SENDV]) - # added on v4.16, 30f6ebf65bc4 - LKSCTP_CHECK_DECL([SCTP_AUTH_NO_AUTH], [HAVE_SCTP_AUTH_NO_AUTH]) - --# New members to sctp_paddrparams, added on v4.18, 0b0dce7a36fb -+# New members to sctp_paddrparams, added on v4.19, 0b0dce7a36fb - LKSCTP_CHECK_MEMBER([struct sctp_paddrparams.spp_ipv6_flowlabel], - [HAVE_SCTP_SPP_IPV6_FLOWLABEL]) - LKSCTP_CHECK_MEMBER([struct sctp_paddrparams.spp_dscp], --- -2.7.4 - diff --git a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-fix-netinet-sctp.h-not-to-be-installed.patch b/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-fix-netinet-sctp.h-not-to-be-installed.patch deleted file mode 100644 index 03c6c4f73..000000000 --- a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-fix-netinet-sctp.h-not-to-be-installed.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 378560050a8f93786c590cc99a55461666205b61 Mon Sep 17 00:00:00 2001 -From: Xin Long <lucien.xin@gmail.com> -Date: Fri, 24 Aug 2018 01:13:32 +0800 -Subject: [PATCH] build: fix netinet/sctp.h not to be installed - -After libcnetinet_HEADERS was set to sctp.h.in, netinet/sctp.h can -no longer be installed into ${includedir}. - -Since "AC_CONFIG_HEADERS([src/include/netinet/sctp.h])" is already -added into configure.ac, there's no need to generate sctp.h by -automake. - -So we simply set libcnetinet_HEADERS back to sctp.h. - -Fixes: 9607dd85e70a ("netinet/sctp.h: dynamically build based on system setup") -Signed-off-by: Xin Long <lucien.xin@gmail.com> -Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> ---- - src/include/netinet/Makefile.am | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/include/netinet/Makefile.am b/src/include/netinet/Makefile.am -index ca0aac2..965db8c 100644 ---- a/src/include/netinet/Makefile.am -+++ b/src/include/netinet/Makefile.am -@@ -11,5 +11,4 @@ libcnetinetdir = $(includedir)/netinet - # API. - include_HEADERS = - --libcnetinet_HEADERS = sctp.h.in --BUILT_SOURCES = sctp.h -+libcnetinet_HEADERS = sctp.h --- -2.7.4 - diff --git a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-fix-probing-for-HAVE_SCTP_SENDV.patch b/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-fix-probing-for-HAVE_SCTP_SENDV.patch deleted file mode 100644 index 89c89835d..000000000 --- a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-fix-probing-for-HAVE_SCTP_SENDV.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 596efd6631b83069d41782fb0ee2d6cf76a50dfa Mon Sep 17 00:00:00 2001 -From: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> -Date: Fri, 24 Aug 2018 09:52:59 -0300 -Subject: [PATCH] build: fix probing for HAVE_SCTP_SENDV - -Somehow it was using a type that is non-existent. The right one is -sctp_prinfo, introduced on ed63afb8a318 ("sctp: add support for PR-SCTP -Information for sendmsg"), present on v4.17. - -Fixes: 1b798f1ca3b5 ("build: add define HAVE_SCTP_AUTH_NO_AUTH") -Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> -Reviewed-by: Xin Long <lucien.xin@gmail.com> ---- - configure.ac | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index dad658c..f55775a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -94,9 +94,8 @@ LKSCTP_CHECK_MEMBER([struct sctp_pdapi_event.pdapi_stream], - LKSCTP_CHECK_MEMBER([struct sctp_pdapi_event.pdapi_seq], - [HAVE_SCTP_PDAPI_EVENT_PDAPI_SEQ]) - --# PR-SCTP field used to probe for sendv/recvv support, added on v4.17 --LKSCTP_CHECK_MEMBER([struct sendv_prinfo.sctp_prinfo], -- [HAVE_SCTP_SENDV]) -+# PR-SCTP struct used to probe for sendv/recvv support, added on v4.17 -+LKSCTP_CHECK_TYPE([struct sctp_prinfo], [HAVE_SCTP_SENDV]) - - # This event indicates that the peer does not support SCTP authentication, - # added on v4.16, 30f6ebf65bc4 --- -2.7.4 - diff --git a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-remove-v4.12-secondary-defines-in-favor-of-HAV.patch b/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-remove-v4.12-secondary-defines-in-favor-of-HAV.patch deleted file mode 100644 index d22cda681..000000000 --- a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-remove-v4.12-secondary-defines-in-favor-of-HAV.patch +++ /dev/null @@ -1,52 +0,0 @@ -From db6d15bf12a0123e4320e5fd7cb688331dea1bdc Mon Sep 17 00:00:00 2001 -From: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> -Date: Fri, 24 Aug 2018 09:52:58 -0300 -Subject: [PATCH] build: remove v4.12 secondary defines in favor of - HAVE_SCTP_STREAM_RECONFIG - -These were backups, commented out since beginning. -HAVE_SCTP_STREAM_RECONFIG is enough to identify that these are there, so -lets use only one. - -Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> -Reviewed-by: Xin Long <lucien.xin@gmail.com> ---- - configure.ac | 8 -------- - src/include/netinet/sctp.h.in | 2 -- - 2 files changed, 10 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 2ae36ec..dad658c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -82,14 +82,6 @@ AC_CHECK_FUNCS([bzero gethostbyname gettimeofday memmove memset select socket \ - LKSCTP_CHECK_MEMBER([struct sctp_event_subscribe.sctp_stream_reset_event], - [HAVE_SCTP_STREAM_RESET_EVENT]) - --# Support for assoc reset event, added on v4.12, c95129d127c6 --#LKSCTP_CHECK_MEMBER([struct sctp_event_subscribe.sctp_assoc_reset_event], \ --# [HAVE_SCTP_ASSOC_RESET_EVENT]) -- --# Support for stream change event, added on v4.12, b444153fb5a6 --#LKSCTP_CHECK_MEMBER([struct sctp_event_subscribe.sctp_stream_change_event], \ --# [HAVE_SCTP_STREAM_CHANGE_EVENT]) -- - # RFC 6525 (Stream Reconf), finished on v4.12, c0d8bab6ae51 - LKSCTP_CHECK_DECL([SCTP_RECONFIG_SUPPORTED], [HAVE_SCTP_STREAM_RECONFIG]) - -diff --git a/src/include/netinet/sctp.h.in b/src/include/netinet/sctp.h.in -index c049077..2009f1c 100644 ---- a/src/include/netinet/sctp.h.in -+++ b/src/include/netinet/sctp.h.in -@@ -61,8 +61,6 @@ extern "C" { - #define HAVE_SCTP_CANSET_PRIMARY - - #undef HAVE_SCTP_STREAM_RESET_EVENT --#undef HAVE_SCTP_ASSOC_RESET_EVENT --#undef HAVE_SCTP_STREAM_CHANGE_EVENT - #undef HAVE_SCTP_STREAM_RECONFIG - #undef HAVE_SCTP_PEELOFF_FLAGS - #undef HAVE_SCTP_PDAPI_EVENT_PDAPI_STREAM --- -2.7.4 - diff --git a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-configure.ac-add-CURRENT-REVISION-and-AGE-for-libsct.patch b/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-configure.ac-add-CURRENT-REVISION-and-AGE-for-libsct.patch deleted file mode 100644 index bec9bf0d1..000000000 --- a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-configure.ac-add-CURRENT-REVISION-and-AGE-for-libsct.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 7de2bd7e769f10521e3d0c2cb42c6f6b9b505dd0 Mon Sep 17 00:00:00 2001 -From: Xin Long <lucien.xin@gmail.com> -Date: Thu, 16 Aug 2018 14:12:30 +0800 -Subject: [PATCH] configure.ac: add CURRENT REVISION and AGE for libsctp and - libwithsctp - -Add CURRENT REVISION and AGE for libsctp and libwithsctp in -configure.ac to update these 2 library version information. - -Compatible with before, they will start from 1:18:0. But each -will get updated according to their definitions in the future. - -Signed-off-by: Xin Long <lucien.xin@gmail.com> -Acked-by: Neil Horman <nhorman@tuxdriver.com> -Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> ---- - configure.ac | 7 +++++++ - src/lib/Makefile.am | 7 +++++-- - src/withsctp/Makefile.am | 3 ++- - 3 files changed, 14 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 275ef4e..2ae36ec 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -14,6 +14,13 @@ dnl reduce clutter in the root; if we put it below AM_INIT_AUTOMAKE, - dnl configure will fail ...) - - AC_INIT([lksctp-tools], [1.0.18], [], [], [http://www.lksctp.org/]) -+AC_SUBST(LIBSCTP_CURRENT, 1) -+AC_SUBST(LIBSCTP_REVISION, 18) -+AC_SUBST(LIBSCTP_AGE, 0) -+AC_SUBST(LIBWITHSCTP_CURRENT, 1) -+AC_SUBST(LIBWITHSCTP_REVISION, 18) -+AC_SUBST(LIBWITHSCTP_AGE, 0) -+ - AC_CONFIG_AUX_DIR(bin) - AC_CONFIG_SRCDIR([src/apps/sctp_darn.c]) - AC_CONFIG_HEADERS([config.h]) -diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am -index 6100c56..1d62175 100644 ---- a/src/lib/Makefile.am -+++ b/src/lib/Makefile.am -@@ -8,5 +8,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/include - - lib_LTLIBRARIES = libsctp.la - --libsctp_la_SOURCES = bindx.c connectx.c peeloff.c opt_info.c addrs.c sendmsg.c recvmsg.c Versions.map --libsctp_la_LDFLAGS = -version-info 1:17:0 -Wl,--version-script=$(srcdir)/Versions.map -+libsctp_la_SOURCES = bindx.c connectx.c peeloff.c opt_info.c \ -+ addrs.c sendmsg.c recvmsg.c Versions.map -+libsctp_la_LDFLAGS = -version-info \ -+ @LIBSCTP_CURRENT@:@LIBSCTP_REVISION@:@LIBSCTP_AGE@ \ -+ -Wl,--version-script=$(srcdir)/Versions.map -diff --git a/src/withsctp/Makefile.am b/src/withsctp/Makefile.am -index 70b1cca..1f6ca37 100644 ---- a/src/withsctp/Makefile.am -+++ b/src/withsctp/Makefile.am -@@ -14,7 +14,8 @@ AM_CPPFLAGS=-I$(top_srcdir)/src/include - pkglib_LTLIBRARIES = libwithsctp.la - libwithsctp_la_SOURCES = sctp_load_libs.c sctp_socket.c sctp_bind.c \ - sctp_sockopt.c sctp_socket.h --libwithsctp_la_LDFLAGS = -version-info 1:17:0 -ldl -+libwithsctp_la_LDFLAGS = -version-info \ -+ @LIBWITHSCTP_CURRENT@:@LIBWITHSCTP_REVISION@:@LIBWITHSCTP_AGE@ -ldl - - pkgdoc_DATA = sctp_load_libs.c sctp_socket.c sctp_bind.c \ - sctp_sockopt.c sctp_socket.h checksctp.c --- -2.7.4 - diff --git a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-test_1_to_1_events.c-initialize-event-properly.patch b/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-test_1_to_1_events.c-initialize-event-properly.patch deleted file mode 100644 index 621e6f469..000000000 --- a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-test_1_to_1_events.c-initialize-event-properly.patch +++ /dev/null @@ -1,44 +0,0 @@ -From e1e670defb84d51efdd124e5f3fa166a1a4b7c1d Mon Sep 17 00:00:00 2001 -From: Mingli Yu <Mingli.Yu@windriver.com> -Date: Tue, 25 Sep 2018 11:39:43 +0800 -Subject: [PATCH] test_1_to_1_events.c: initialize event properly - -Initialize event properly to avoid below -Segmentation fault when run below test -related to AUTH_NO_AUTH. - - # ./test_1_to_1_events -test_1_to_1_events.c 1 PASS : COMM_UP notification on client socket - SUCCESS -test_1_to_1_events.c 2 PASS : COMM_UP notification on server socket - SUCCESS -test_1_to_1_events.c 3 BROK : Got a datamsg, expecting notification -DUMP_CORE sctputil.c: 187 -[ 1468.733938] test_1_to_1_eve[2376]: segfault at 0 ip 0000561a4a3d5079 sp 00007ffd49101580 error 6 in test_1_to_1_events[561a4a3d4000+2000] -[ 1468.734479] Code: ff bf 0a 00 00 00 e8 e6 ef ff ff b9 c9 00 00 00 48 8d 15 61 13 00 00 bf 01 00 00 00 31 c0 48 8d 35 c7 0f 00 00 e8 97 f0 -Segmentation fault - -Upstream-Status: Pending - -Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> ---- - src/func_tests/test_1_to_1_events.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/func_tests/test_1_to_1_events.c b/src/func_tests/test_1_to_1_events.c -index 46439bf..a086832 100644 ---- a/src/func_tests/test_1_to_1_events.c -+++ b/src/func_tests/test_1_to_1_events.c -@@ -92,9 +92,11 @@ main(int argc, char *argv[]) - /* Create the client socket. */ - clt_sk = test_socket(AF_INET, SOCK_STREAM, IPPROTO_SCTP); - -+ memset(&event, 0, sizeof(event)); - event.sctp_data_io_event = 1; - event.sctp_association_event = 1; - event.sctp_shutdown_event = 1; -+ event.sctp_authentication_event = 1; - len = sizeof(struct sctp_event_subscribe); - test_setsockopt(svr_sk, SCTP_EVENTS, &event, len); - test_setsockopt(clt_sk, SCTP_EVENTS, &event, len); --- -2.7.4 - diff --git a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-withsctp-use-PACKAGE_VERSION-in-withsctp.h.patch b/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-withsctp-use-PACKAGE_VERSION-in-withsctp.h.patch deleted file mode 100644 index 2537bb976..000000000 --- a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-withsctp-use-PACKAGE_VERSION-in-withsctp.h.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 7c0ef4d441b3833e721df58f56e2cb8c81b34df4 Mon Sep 17 00:00:00 2001 -From: Xin Long <lucien.xin@gmail.com> -Date: Thu, 16 Aug 2018 14:12:01 +0800 -Subject: [PATCH] withsctp: use @PACKAGE_VERSION@ in withsctp.h - -use @PACKAGE_VERSION@ to replace the hardcode version. - -Signed-off-by: Xin Long <lucien.xin@gmail.com> -Acked-by: Neil Horman <nhorman@tuxdriver.com> -Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> ---- - Makefile.rules | 3 ++- - src/withsctp/withsctp.in | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/Makefile.rules b/Makefile.rules -index 83f5f0c..d3693fa 100644 ---- a/Makefile.rules -+++ b/Makefile.rules -@@ -15,4 +15,5 @@ - edit = @sed \ - -e "s|\@bindir\@|$(bindir)|" \ - -e "s|\@libdir\@|$(libdir)|" \ -- -e "s|\@PACKAGE\@|$(PACKAGE)|" -+ -e "s|\@PACKAGE\@|$(PACKAGE)|" \ -+ -e "s|\@PACKAGE_VERSION\@|$(PACKAGE_VERSION)|" -diff --git a/src/withsctp/withsctp.in b/src/withsctp/withsctp.in -index 7f182ba..fda5ebc 100644 ---- a/src/withsctp/withsctp.in -+++ b/src/withsctp/withsctp.in -@@ -2,7 +2,8 @@ - # -*- sh -*- - LIBDIR=@libdir@/@PACKAGE@ - BINDIR=@bindir@ --export LD_PRELOAD=${LIBDIR}/libwithsctp.so.1.0.17 -+LIBVER=@PACKAGE_VERSION@ -+export LD_PRELOAD=${LIBDIR}/libwithsctp.so.${LIBVER} - if ! ${BINDIR}/checksctp 2> /dev/null - then - ${BINDIR}/checksctp; --- -2.7.4 - 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 3cabc4ff8..1e2c644b4 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 @@ -8,20 +8,13 @@ LIC_FILES_CHKSUM = " \ file://COPYING;md5=0c56db0143f4f80c369ee3af7425af6e \ " -SRCREV = "1b077af62d83d53c34b1bde8bad6648149d5edf9" +SRCREV = "12c74404e09755561dee40cf194954f7ff5afd60" PV .= "+git${SRCPV}" LK_REL = "1.0.18" SRC_URI = " \ git://github.com/sctp/lksctp-tools.git \ - file://0001-withsctp-use-PACKAGE_VERSION-in-withsctp.h.patch \ - file://0001-configure.ac-add-CURRENT-REVISION-and-AGE-for-libsct.patch \ - file://0001-build-fix-netinet-sctp.h-not-to-be-installed.patch \ - file://0001-build-remove-v4.12-secondary-defines-in-favor-of-HAV.patch \ - file://0001-build-fix-probing-for-HAVE_SCTP_SENDV.patch \ - file://0001-build-0b0dce7a36fb-actually-belongs-to-v4.19.patch \ - file://0001-test_1_to_1_events.c-initialize-event-properly.patch \ file://run-ptest \ file://v4test.sh \ file://v6test.sh \ diff --git a/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.41.0.bb b/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.42.0.bb index 29ab0b75a..d24b0b475 100644 --- a/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.41.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.42.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] = "549db3507a7637b28ca467c7f3e9e023" -SRC_URI[sha256sum] = "abc25b8dc601f5b3fefe084ce50fcbdc63e3385621bee0cbfa7b57f9ec3e67c2" +SRC_URI[md5sum] = "c38f1d230af8cec480ff9dd60c9e0db0" +SRC_URI[sha256sum] = "c5a7f09020f31247d0d1609078a75efadeccb7e5b86fc2e4389189b1b431fe63" inherit cmake manpages python3native PACKAGECONFIG[manpages] = "" diff --git a/meta-openembedded/meta-networking/recipes-support/ntop/ntop/0001-nDPI-Include-sys-types.h.patch b/meta-openembedded/meta-networking/recipes-support/ntop/ntop/0001-nDPI-Include-sys-types.h.patch deleted file mode 100644 index 81ffeec21..000000000 --- a/meta-openembedded/meta-networking/recipes-support/ntop/ntop/0001-nDPI-Include-sys-types.h.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 6543f3e2d5fe214e2fc6c050289bf1ae73b18724 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 30 Aug 2017 13:56:24 -0700 -Subject: [PATCH] nDPI: Include sys/types.h - -Needed for uint_t types - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - nDPI/src/include/ipq_api.h | 1 + - 1 file changed, 1 insertion(+) - -Index: ntop-5.0.1/nDPI/src/include/ipq_api.h -=================================================================== ---- ntop-5.0.1.orig/nDPI/src/include/ipq_api.h -+++ ntop-5.0.1/nDPI/src/include/ipq_api.h -@@ -24,6 +24,7 @@ - #ifndef __IPOQUE_API_INCLUDE_FILE__
- #define __IPOQUE_API_INCLUDE_FILE__
-
-+#include <sys/types.h>
-
- #if defined(HAVE_NTOP) && defined(WIN32)
- #include <winsock2.h>
diff --git a/meta-openembedded/meta-networking/recipes-support/ntop/ntop/0001-plugins-Makefile.am-fix-for-automake-1.16.1.patch b/meta-openembedded/meta-networking/recipes-support/ntop/ntop/0001-plugins-Makefile.am-fix-for-automake-1.16.1.patch deleted file mode 100644 index d6f7eb555..000000000 --- a/meta-openembedded/meta-networking/recipes-support/ntop/ntop/0001-plugins-Makefile.am-fix-for-automake-1.16.1.patch +++ /dev/null @@ -1,74 +0,0 @@ -From d22ddc73f00ed056032a635ee8379305ec83bf81 Mon Sep 17 00:00:00 2001 -From: Robert Yang <liezhi.yang@windriver.com> -Date: Wed, 11 Jul 2018 12:02:50 +0800 -Subject: [PATCH] plugins/Makefile.am: fix for automake 1.16.1 - -Fixed: -| i586-poky-linux-gcc: error: netflowPlugin.o: No such file or directory -| i586-poky-linux-gcc: error: unrecognized command line option '-flat_namespace'; did you mean '-Wnamespaces'? -| i586-poky-linux-gcc: fatal error: no input files - -The previous code make things complicated, but we don't have to, let libtool do -most of the things can fix the problem. - -Upstream-Status: Pending [ntop is not longer maintained any more, we need consider moving to ntopng] - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> ---- - plugins/Makefile.am | 34 ++++++---------------------------- - 1 file changed, 6 insertions(+), 28 deletions(-) - -diff --git a/plugins/Makefile.am b/plugins/Makefile.am -index 64492e0..bcd0c10 100644 ---- a/plugins/Makefile.am -+++ b/plugins/Makefile.am -@@ -69,40 +69,18 @@ libsflowPlugin_la_CFLAGS = $(AM_CFLAGS) - # by default ntop looks for plugins in the plugins/ subdirectory - # - -- --.libs/libnetflowPlugin.so@SO_VERSION_PATCH@: -- @if test -f libnetflowPlugin_la-netflowPlugin.o; then \ -- $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libnetflowPlugin.so@SO_VERSION_PATCH@ libnetflowPlugin_la-netflowPlugin.o; \ -- else \ -- $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libnetflowPlugin.so@SO_VERSION_PATCH@ netflowPlugin.o; \ -- fi -- --netflowPlugin.so$(EXEEXT): .libs/libnetflowPlugin.so@SO_VERSION_PATCH@ -- @$(LN_S) .libs/libnetflowPlugin.so netflowPlugin.so -+netflowPlugin.so$(EXEEXT): libnetflowPlugin.la -+ @$(LN_S) -f .libs/libnetflowPlugin.so netflowPlugin.so - - ############### - --.libs/librrdPlugin.so@SO_VERSION_PATCH@: -- @if test -f librrdPlugin_la-rrdPlugin.o; then \ -- $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/librrdPlugin.so@SO_VERSION_PATCH@ librrdPlugin_la-rrdPlugin.o; \ -- else \ -- $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/librrdPlugin.so@SO_VERSION_PATCH@ rrdPlugin.o; \ -- fi -- --rrdPlugin.so$(EXEEXT): .libs/librrdPlugin.so@SO_VERSION_PATCH@ -- @$(LN_S) .libs/librrdPlugin.so rrdPlugin.so -+rrdPlugin.so$(EXEEXT): librrdPlugin.la -+ @$(LN_S) -f .libs/librrdPlugin.so rrdPlugin.so - - ############### - --.libs/libsflowPlugin.so@SO_VERSION_PATCH@: -- @if test -f libsflowPlugin_la-sflowPlugin.o; then \ -- $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libsflowPlugin.so@SO_VERSION_PATCH@ libsflowPlugin_la-sflowPlugin.o; \ -- else \ -- $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libsflowPlugin.so@SO_VERSION_PATCH@ sflowPlugin.o; \ -- fi -- --sflowPlugin.so$(EXEEXT): .libs/libsflowPlugin.so@SO_VERSION_PATCH@ -- @$(LN_S) .libs/libsflowPlugin.so sflowPlugin.so -+sflowPlugin.so$(EXEEXT): libsflowPlugin.la -+ @$(LN_S) -f .libs/libsflowPlugin.so sflowPlugin.so - - ############### - --- -2.7.4 - diff --git a/meta-openembedded/meta-networking/recipes-support/ntop/ntop/embed-libs.patch b/meta-openembedded/meta-networking/recipes-support/ntop/ntop/embed-libs.patch deleted file mode 100644 index 2d1ab7371..000000000 --- a/meta-openembedded/meta-networking/recipes-support/ntop/ntop/embed-libs.patch +++ /dev/null @@ -1,20 +0,0 @@ -Use --embed option so that it can return libpython as well - -% ../recipe-sysroot-native/usr/bin/python3-native/python3-config --libs --embed --lpython3.8 -lcrypt -lpthread -ldl -lutil -lm -lm -[kraj@apollo /mnt/b/yoe/build/tmp/work/cortexa7t2hf-neon-vfpv4-yoe-linux-gnueabi/ntop/5.0.1-r0/ntop-5.0.1] -% ../recipe-sysroot-native/usr/bin/python3-native/python3-config --libs --lcrypt -lpthread -ldl -lutil -lm -lm - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- a/configure.in -+++ b/configure.in -@@ -1463,7 +1463,7 @@ dnl> - fi - - if test "x$PYTHON_CONFIG" != "x"; then -- PYTHON_LIBS="`$PYTHON_CONFIG --libs`" -+ PYTHON_LIBS="`$PYTHON_CONFIG --libs --embed`" - if test "x$PYTHON_LIBS" = "x"; then - AC_MSG_RESULT(Python[-devel] support is present but misconfigured) - else diff --git a/meta-openembedded/meta-networking/recipes-support/ntop/ntop/fix-missing-return-from-non-void-function.patch b/meta-openembedded/meta-networking/recipes-support/ntop/ntop/fix-missing-return-from-non-void-function.patch deleted file mode 100644 index e627e59a5..000000000 --- a/meta-openembedded/meta-networking/recipes-support/ntop/ntop/fix-missing-return-from-non-void-function.patch +++ /dev/null @@ -1,19 +0,0 @@ -Fix following error: - -netflowPlugin.c: In function 'netflowUtilsLoop': -netflowPlugin.c:2144:1: error: no return statement in function returning non-void [-Werror=return-type] - 2144 | } - | ^ - -Return NULL like netflowMainLoop does. - ---- ntop-5.0.1.orig/plugins/netflowPlugin.c 2012-03-09 17:44:17.000000000 +0000 -+++ ntop-5.0.1/plugins/netflowPlugin.c 2019-08-09 10:25:40.878799852 +0000 -@@ -2141,6 +2141,7 @@ - waitCondvar(&myGlobals.device[deviceId].netflowGlobals->ifStatsQueueCondvar); - } - } -+ return(NULL); - } - #endif - diff --git a/meta-openembedded/meta-networking/recipes-support/ntop/ntop/ntop.service b/meta-openembedded/meta-networking/recipes-support/ntop/ntop/ntop.service deleted file mode 100644 index 1ead2a0c5..000000000 --- a/meta-openembedded/meta-networking/recipes-support/ntop/ntop/ntop.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=A network traffic probe similar to the UNIX top command -Requires=network.target - -ConditionPathExists=@SYSCONFDIR@/ntop.conf -After=syslog.target network.target - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=@LIBEXECDIR@/ntop-helper start -ExecStop=@LIBEXECDIR@/ntop-helper stop - -[Install] -WantedBy=multi-user.target diff --git a/meta-openembedded/meta-networking/recipes-support/ntop/ntop/ntop_configure_in.patch b/meta-openembedded/meta-networking/recipes-support/ntop/ntop/ntop_configure_in.patch deleted file mode 100644 index 392cb082b..000000000 --- a/meta-openembedded/meta-networking/recipes-support/ntop/ntop/ntop_configure_in.patch +++ /dev/null @@ -1,164 +0,0 @@ -1)add --with-pcap-config option to use libpcap's pcap-config -2)add AC_CHECK_LIB if user didn't specify PCAP_ROOT and pcap-config - put it before host check to make cross-compiling easier. - pcap doesn't need extra include and libs so it is fine. -3)remove old rrd configure code but use pkg-config to config rrd - rrdtool should have the pkg-config file installed. -4)fix python-config -5)change AC_TRY_RUN to AC_COMPILE_IFELSE for pthread_rwlock_t checking -6)fix a net-snmp-config bug - -Upstream-Status: Pending - -Signed-off-by: Yao Zhao <yao.zhao@windriver.com> ---- -diff --git a/configure.in b/configure.in -index 0c7c0a5..cad40be 100644 ---- a/configure.in -+++ b/configure.in -@@ -230,14 +230,14 @@ dnl> - AC_ARG_WITH(void, - [ +-External-source-locations:-------------------------------------------------+]) - --AC_ARG_WITH( rrd-home, -- [ --with-rrd-home=DIR Usually /usr/local/rrdtool-1.2.x], -- RRD_HOME="$withval", -- RRD_HOME=/usr/local/rrdtool-1.2.19) - AC_ARG_WITH( pcap-root, - [ --with-pcap-root=DIR LBNL pcap located in DIR], - PCAP_ROOT="$withval", - PCAP_ROOT=) -+AC_ARG_WITH( pcap-config, -+ [ --with-pcap-config=path/pcap-config where to find pcap-config], -+ PCAP_CONFIG="$withval", -+ PCAP_CONFIG=) - AC_ARG_WITH( gdbm-root, - [ --with-gdbm-root=DIR gdbm located in DIR], - GDBM_DIRECTORY="$withval", -@@ -556,6 +556,7 @@ if test ".${PCAPRING_DIR}" != .; then - else - - TMP_ROOT=${HOME}/PF_RING/userland/libpcap/ -+FOUND_PCAP=1 - if test ".${PCAP_ROOT}" == . && - test -d ${TMP_ROOT} && - test -r ${TMP_ROOT}/libpcap.a; then -@@ -563,6 +564,18 @@ if test ".${PCAP_ROOT}" == . && - CORELIBS="${CORELIBS} -L${TMP_ROOT} -L${HOME}/PF_RING/userland/lib -lpfring -lpcap " - INCS="${INCS} -I ${PCAP_ROOT}" - AC_MSG_RESULT([found in $PCAP_ROOT]) -+elif test -n "${PCAP_CONFIG}" && test -x "${PCAP_CONFIG}"; then -+ CORELIBS="${CORELIBS} $(${PCAP_CONFIG} --libs)" -+ INCS="${INCS} $(${PCAP_CONFIG} --cflags)" -+ AC_DEFINE_UNQUOTED(HAVE_LIBPCAP, 1, [have libpcap ]) -+ AC_MSG_RESULT([found pcap-config: $PCAP_CONFIG, libs:$(${PCAP_CONFIG} --libs) cflags:$(${PCAP_CONFIG} --cflags)]) -+else -+ AC_CHECK_LIB(pcap, pcap_lookupdev, , -+ [FOUND_PCAP=]) -+fi -+ -+if test -n "$FOUND_PCAP"; then -+ : - elif test ".${PCAP_ROOT}" != .; then - if test -d $PCAP_ROOT && - test -r $PCAP_ROOT/lib/libpcap.a && -@@ -880,44 +893,11 @@ AC_CHECK_LIB([z], [zlibVersion], [], [ - exit -1 - ]) - --# RRD --if test -d "$RRD_HOME"; then -- AC_MSG_RESULT(checking for RRD home... yes) --else -- RRD_HOME=/usr/local/rrdtool -- if test -d "$RRD_HOME"; then -- AC_MSG_RESULT(Checking rrdtool in $RRD_HOME) -- else -- RRD_HOME=/usr/local -- fi --fi -- --RRD_LIB="-L${RRD_HOME}/lib -lrrd_th" -- --if test -f "$RRD_HOME/lib/librrd_th.so"; then -- AC_MSG_RESULT(checking for rrdtool... yes) --else -- if test -f "$RRD_HOME/lib/librrd_th.dylib"; then # OSX -- AC_MSG_RESULT(checking for rrdtool... yes) -- else -- if test -f "$RRD_HOME/lib/librrd_th.a"; then -- AC_MSG_RESULT(checking for rrdtool... yes) -- else -- AC_CHECK_LIB([rrd_th], [main]) -- if test ".${ac_cv_lib_rrd_th_main}" != ".yes"; then -- AC_MSG_ERROR(Unable to find RRD at $RRD_HOME: please use --with-rrd-home=DIR); -- AC_MSG_ERROR(RRD source can be downloaded from http://www.rrdtool.org/); -- else -- RRD_LIB= -- fi -- fi -- fi --fi -- --RRD_INC= --if test -d "${RRD_HOME}/include"; then -- RRD_INC="-I${RRD_HOME}/include" --fi -+PKG_CHECK_MODULES( [RRD], [librrd] ) -+AC_SUBST(RRD_CFLAGS) -+AC_SUBST(RRD_LIBS) -+RRD_INC=$RRD_FLAGS -+RRD_LIB=$RRD_LIBS - - dnl> The failed recheck stuff below is courtesy of Chris Turbeville [turbo@verio.net] - dnl> Chris developed this for Solaris 9, confirming work I had done earlier for FreeBSD -@@ -1041,7 +1021,7 @@ AC_CHECK_HEADERS([sched.h sys/sched.h]) - AC_CHECK_HEADERS([pthread.h]) - - AC_MSG_CHECKING([if r/w locks are supported]) --AC_TRY_RUN([ -+AC_COMPILE_IFELSE([ - #include <pthread.h> - - int main() -@@ -1443,15 +1423,15 @@ dnl> NET-SNMP - dnl> - if test ".${ac_disable_snmp}" != ".yes"; then - AC_CHECK_TOOL(NETSNMP, net-snmp-config) -- if test "x$ac_cv_prog_ac_ct_NETSNMP" = "xnet-snmp-config"; then -+ if test -n "$NETSNMP"; then - AC_DEFINE_UNQUOTED(HAVE_SNMP, 1, [SNMP is supported]) -- SNMPLIBS="`net-snmp-config --libs`" -+ SNMPLIBS="`$NETSNMP --libs`" - SNMPLIBS="`echo ${SNMPLIBS}|sed -e s,'-R../lib',,g`" - echo "net-snmp libs: ${SNMPLIBS}" - LIBS="${LIBS} ${SNMPLIBS}" - dnl remove unecessary path - LIBS=`echo ${LIBS}|sed -e s,'-R../lib',,g` -- INCS="${INCS} `net-snmp-config --cflags`" -+ INCS="${INCS} `$NETSNMP --cflags`" - else - AC_MSG_RESULT(NETSNMP is not present: SNMP support is disabled) - fi -@@ -1464,10 +1444,9 @@ SAVED_LIBS=$LIBS - dnl> - dnl> PYTHON - dnl> -- AC_CHECK_TOOL(PYTHON, python-config) -- PYTHON_CONFIG="" -+ AC_CHECK_TOOL(PYTHON_CONFIG, python-config) - -- if test "x$ac_cv_prog_ac_ct_PYTHON" != "xpython-config"; then -+ if test -z "$PYTHON_CONFIG"; then - if test -f "/etc/debian_version"; then - AC_MSG_RESULT(Please install python-dev and rerun configure) - exit 1 -@@ -1481,8 +1460,6 @@ dnl> - PYTHON_CONFIG="python-config" - fi - fi -- else -- PYTHON_CONFIG="python-config" - fi - - if test "x$PYTHON_CONFIG" != "x"; then diff --git a/meta-openembedded/meta-networking/recipes-support/ntop/ntop/ntop_configure_in_net_snmp_config_exist.patch b/meta-openembedded/meta-networking/recipes-support/ntop/ntop/ntop_configure_in_net_snmp_config_exist.patch deleted file mode 100644 index 269138df9..000000000 --- a/meta-openembedded/meta-networking/recipes-support/ntop/ntop/ntop_configure_in_net_snmp_config_exist.patch +++ /dev/null @@ -1,21 +0,0 @@ -Check net-snmp-config's existence in case user specified the -ac_cv_prog_NETSNMP to avoid HAVE_SNMP defined if the specified -net-snmp-config doesn't exist. - -Upstream-Status: Inappropriate [Embedded specific] - -Signed-off-by: Yao Zhao <yao.zhao@windriver.com> ---- -diff --git a/configure.in b/configure.in -index 6f3e88f..8ddf017 100755 ---- a/configure.in -+++ b/configure.in -@@ -1423,7 +1423,7 @@ dnl> NET-SNMP - dnl> - if test ".${ac_disable_snmp}" != ".yes"; then - AC_CHECK_TOOL(NETSNMP, net-snmp-config) -- if test -n "$NETSNMP"; then -+ if test -n "$NETSNMP" -a -e "$NETSNMP"; then - AC_DEFINE_UNQUOTED(HAVE_SNMP, 1, [SNMP is supported]) - SNMPLIBS="`$NETSNMP --libs`" - SNMPLIBS="`echo ${SNMPLIBS}|sed -e s,'-R../lib',,g`" diff --git a/meta-openembedded/meta-networking/recipes-support/ntop/ntop/ntop_init.patch b/meta-openembedded/meta-networking/recipes-support/ntop/ntop/ntop_init.patch deleted file mode 100644 index e7684c1b4..000000000 --- a/meta-openembedded/meta-networking/recipes-support/ntop/ntop/ntop_init.patch +++ /dev/null @@ -1,228 +0,0 @@ -Modify ntop.init to WRLinux 5.0 style. - -Fix a small problem that when ntop not running, -/etc/init.d/ntop stop will return 1 - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Yao Zhao <yao.zhao@windriver.com> ---- - packages/RedHat/ntop.init | 102 +++++++++----------------------------------- - 1 files changed, 21 insertions(+), 81 deletions(-) - -diff --git a/packages/RedHat/ntop.init b/packages/RedHat/ntop.init -index 40d49f1..a189c59 100755 ---- a/packages/RedHat/ntop.init -+++ b/packages/RedHat/ntop.init -@@ -10,19 +10,9 @@ - # You have set the admin password - read docs/1STRUN.txt - # You have created /etc/ntop.conf with appropriate parameters. - --# To identify an interface to ntop, use the following flags --# in /etc/sysconfig/network-scripts/ifcfg-ethx -- --# NTOP="yes" <--- means for ntop to use this interface --# NTOPCONFIG="yes" <--- means for ntop to configure this interface -- - # Note that if you give a -i parameter in either /etc/ntop.conf or - # the command line, the scan is NOT performed. - --# However, when it comes to the configuration step, with NTOPCONFIG="yes" --# the interface is configured regardless of how the interface list was --# specified. -- - # - # -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- - # -@@ -107,11 +97,7 @@ ntopusesyslog="local3" - invoked=$0 - - # Source function library. --. /etc/rc.d/init.d/functions -- --# Source networking configuration. --. /etc/sysconfig/network -- -+. /etc/init.d/functions - - # Basic sanity checks... - if ! [ -x $prog ]; then -@@ -124,16 +110,6 @@ if ! [ -x $prog ]; then - exit 1 - fi - --if [ ${NETWORKING} = "no" ]; then -- echo "" -- echo "ERROR -" -- echo " Networking is not up!" -- echo "" -- echo "Aborting..." -- echo "" -- exit 1 --fi -- - if ! [ -f ${conf} ]; then - echo "" - echo "ERROR -" -@@ -180,8 +156,8 @@ fi - if [ "${debug}" = "y" ]; then echo "DEBUG: parm file temp is ${parmfile}"; fi - - cmd=`echo \ -- @${conf} \ - -i tbd \ -+ @${conf} \ - $extra $@` - - echo ${cmd} | awk ' \ -@@ -305,42 +281,6 @@ logger -p ${ntopusesyslog} -t ${name}${instance} -- "INITD - Configuration - - # Build list of interfaces, e.g eth0 eth1 eth1:1 - # (Yeah, we'll have to convert that to eth0,eth1,eth1:1 later --if [ ".${ntopinterface}" = ".tbd" ]; then -- -- ntopinterface="" -- iflist=`ip link show | \ -- awk '/^[0-9]*:\ eth/ { printf("%s ", substr($2, 1, length($2)-1)) }'` -- logger -p ${ntopusesyslog} -t ${name}${instance} -- "INITD - Scanning all interfaces $iflist" -- if [ "${debug}" = "y" ]; then echo "DEBUG: Interface candidates are ${iflist}"; fi -- -- for eth in $iflist; do -- -- if ! LANG=C egrep -L "^[Nn][Tt][Oo][Pp]=['\"]?[Yy][Ee][Ss]['\"]?" \ -- /etc/sysconfig/network-scripts/ifcfg-$eth > /dev/null ; then -- logger -p ${ntopusesyslog} -t ${name}${instance} -- "INITD - $eth is not ntop=yes, skipping" -- if [ "${debug}" = "y" ]; then echo "DEBUG: $eth not ntop=yes"; fi -- continue -- fi -- -- ntopinterface="${ntopinterface} $eth" -- -- ip=`ip addr show $eth | \ -- awk '/inet/ { printf("%s", substr($2, 1, index($2, "/")-1)) }'` -- -- if [ ".$ip" = "." ]; then -- is="is unnumbered interface" -- else -- is="has IP address $ip" -- fi -- logger -p ${ntopusesyslog} -t ${name}${instance} -- "INITD - $eth is ntop=yes, ${is}" -- if [ "${debug}" = "y" ]; then echo "DEBUG: $eth ntop=yes, ${is}"; fi -- -- done -- --else -- logger -p ${ntopusesyslog} -t ${name}${instance} -- "INITD - Skipping interface scan - list in parms" --fi -- - if [ "x${ntopinterface}" = "x" ]; then - ntopinterface="none" - fi -@@ -462,12 +402,6 @@ config_interfaces () { - if="${if},${eth}" - fi - -- if ! LANG=C egrep -L "^[Nn][Tt][Oo][Pp][Cc].*=['\"]?[Yy][Ee][Ss]['\"]?" \ -- /etc/sysconfig/network-scripts/ifcfg-$eth > /dev/null ; then -- logger -p ${ntopusesyslog} -t ${name}${instance} -- "INITD - $eth is not ntopconfigure=yes, skipping" -- continue -- fi -- - logger -p ${ntopusesyslog} -t ${name}${instance} -- "INITD - Configuring $eth" - if [ "${debug}" = "y" ]; then echo "DEBUG: Configuring $eth"; fi - -@@ -527,7 +461,7 @@ start () { - show_extra - config_interfaces - -- cmd=`echo $prog \ -+ cmd=`echo \ - @${conf} \ - -i $if \ - $extra $@` -@@ -541,7 +475,7 @@ start () { - if [ ".${ldlibpath}" != "." ]; then - export LD_LIBRARY_PATH="${ldlibpath}" - fi -- daemon ${cmd} -+ start-stop-daemon --start --quiet --exec $prog -- ${cmd} - RETVAL=$? - - [ $RETVAL = 0 ] && touch /var/lock/subsys/${name}${instance} -@@ -551,6 +485,7 @@ start () { - stop () { - # stop daemon - -+ NOT_RUNNING=1 - RETVAL=1 - echo -n $"Stopping ${name}${instance}: " - logger -p ${ntopusesyslog} -t ${name}${instance} -- "INITD - Stopping: ${name}${instance}" -@@ -563,13 +498,14 @@ stop () { - if [ $rc = 0 ]; then - logger -p ${ntopusesyslog} -t ${name}${instance} -- "INITD - Sending SIGTERM to ${pid}" - if [ "${debug}" = "y" ]; then echo "Sending SIGTERM to ${pid}"; fi -- kill -s SIGTERM ${pid} -+ kill -TERM ${pid} 2>&1 > /dev/null - RETVAL=$? - rm -f ${ntopdbfilepath}/ntop.pid - else - logger -p ${ntopusesyslog} -t ${name}${instance} -- "INITD - Unable to find process ${pid} ... will kill by name" - if [ "${debug}" = "y" ]; then echo "Unable to find process ${pid} ... will kill by name"; fi - fi -+ NOT_RUNNING=0 - else - - logger -p ${ntopusesyslog} -t ${name}${instance} -- "INITD - Unable to find ${ntopdbfilepath}/ntop.pid file ... will kill by name" -@@ -577,15 +513,16 @@ stop () { - - fi - -- echo -- - if [ $RETVAL != 0 ]; then - pids=`ps axf | grep '\/usr\/bin\/ntop' | awk '{ printf(" %s", $1) }; END { print "" }'` -- if [ "${pids}" != " " ]; then -+ if [ "${pids}" != "" ]; then - logger -p ${ntopusesyslog} -t ${name}${instance} -- "INITD - Sending SIGTERM to ${prog}...${pids}" - if [ "${debug}" = "y" ]; then echo "Sending SIGTERM to ${prog}...${pids}"; fi -- kill -INT ${pids} -+ kill -TERM ${pids} > /dev/null 2>&1 - RETVAL=$? -+ NOT_RUNNING=0 -+ else -+ NOT_RUNNING=1 - fi - fi - -@@ -597,13 +534,9 @@ stop () { - if [ "${debug}" = "y" ]; then echo "DEBUG: Unconfiguring interfaces"; fi - - for eth in ${ntopinterface}; do -- if ! LANG=C egrep -L "^[Nn][Tt][Oo][Pp][Cc].*=['\"]?[Yy][Ee][Ss]['\"]?" \ -- /etc/sysconfig/network-scripts/ifcfg-$eth > /dev/null ; then -- logger -p ${ntopusesyslog} -t ${name}${instance} -- "INITD - $eth is not ntopconfigure=yes, skipping" -- if [ "${debug}" = "y" ]; then echo "DEBUG: $eth is not ntopconfigure=yes"; fi -- continue -+ if [ "$eth" = "none" ]; then -+ continue - fi -- - logger -p ${ntopusesyslog} -t ${name}${instance} -- "INITD - Unconfiguring $eth" - if [ "${debug}" = "y" ]; then echo "DEBUG: Unconfiguring $eth"; fi - -@@ -623,6 +556,13 @@ stop () { - if [ "${debug}" = "y" ]; then echo "DEBUG: Interfaces are unconfigured"; fi - fi - -+ if [ $NOT_RUNNING -eq 1 -o $RETVAL -eq 0 ]; then -+ echo " [ OK ]" -+ RETVAL=0 -+ else -+ echo " [ FAILED ]" -+ fi -+ - return $RETVAL - } - --- -1.7.5.4 - diff --git a/meta-openembedded/meta-networking/recipes-support/ntop/ntop/ntop_webInterface.patch b/meta-openembedded/meta-networking/recipes-support/ntop/ntop/ntop_webInterface.patch deleted file mode 100644 index 9f57ca425..000000000 --- a/meta-openembedded/meta-networking/recipes-support/ntop/ntop/ntop_webInterface.patch +++ /dev/null @@ -1,19 +0,0 @@ -change osName to version as it prints out "ntop Version". - -Upstream-Status: Pending - -Signed-off-by: Yao Zhao <yao.zhao@windriver.com> ---- -diff --git a/webInterface.c b/webInterface.c -index 5622e69..8cb7a67 100644 ---- a/webInterface.c -+++ b/webInterface.c -@@ -5816,7 +5816,7 @@ static void printNtopConfigInfoData(int textPrintFlag, UserPref *pref) { - printInfoSectionTitle(textPrintFlag, "Basic Information"); - - safe_snprintf(__FILE__, __LINE__, formatBuf, sizeof(formatBuf), "%s (%d bit)", -- osName, sizeof(long) == 8 ? 64 : 32); -+ version, sizeof(long) == 8 ? 64 : 32); - printFeatureConfigInfo(textPrintFlag, "ntop Version", formatBuf); - - #ifndef WIN32 diff --git a/meta-openembedded/meta-networking/recipes-support/ntop/ntop/use-static-inline.patch b/meta-openembedded/meta-networking/recipes-support/ntop/ntop/use-static-inline.patch deleted file mode 100644 index 2b001c13e..000000000 --- a/meta-openembedded/meta-networking/recipes-support/ntop/ntop/use-static-inline.patch +++ /dev/null @@ -1,32 +0,0 @@ -[PATCH] replace 'inline' with 'static inline' for gcc 5.x - -gcc 5.x defaults to -std=gnu11 instead of -std=gnu89 which change -the semantics for inline functions and the standalone 'inline' -causes error with "gcc5 -g -o0" - -Replace inline with static inline to be compatible with both gcc 4 -and 5. - -Upstream-status: Pending - -Signed-off-by: Roy Li <rongqing.li@windriver.com> ---- - nDPI/src/lib/protocols/ssl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/nDPI/src/lib/protocols/ssl.c b/nDPI/src/lib/protocols/ssl.c -index 245b8c3..72beda9 100644 ---- a/nDPI/src/lib/protocols/ssl.c -+++ b/nDPI/src/lib/protocols/ssl.c -@@ -39,7 +39,7 @@ static void ipoque_int_ssl_add_connection(struct ipoque_detection_module_struct - - #ifdef HAVE_NTOP - #ifndef WIN32 --inline int min(int a, int b) { return(a < b ? a : b); } -+static inline int min(int a, int b) { return(a < b ? a : b); } - #endif - - static void stripCertificateTrailer(char *buffer, int buffer_len) { --- -1.9.1 - diff --git a/meta-openembedded/meta-networking/recipes-support/ntop/ntop_5.0.1.bb b/meta-openembedded/meta-networking/recipes-support/ntop/ntop_5.0.1.bb deleted file mode 100644 index 13a878412..000000000 --- a/meta-openembedded/meta-networking/recipes-support/ntop/ntop_5.0.1.bb +++ /dev/null @@ -1,142 +0,0 @@ -SUMMARY = "ntop is network top" -DESCRIPTION = "ntop is a network traffic probe that shows the network usage, \ -similar to what the popular top Unix command does." - -SECTION = "console/network" - -LICENSE = "GPLv2+ & GPLv3 & OpenSSL" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://LICENSE-OpenSSL.txt;md5=a409f902e447ddd889cffa0c70e7c7c2 \ - " - -SRC_URI = "${SOURCEFORGE_MIRROR}/ntop/ntop-${PV}.tar.gz \ - file://ntop_configure_in.patch \ - file://ntop_init.patch \ - file://ntop_webInterface.patch \ - file://ntop_configure_in_net_snmp_config_exist.patch \ - file://ntop.service \ - file://use-static-inline.patch \ - file://0001-nDPI-Include-sys-types.h.patch \ - file://0001-plugins-Makefile.am-fix-for-automake-1.16.1.patch \ - file://fix-missing-return-from-non-void-function.patch \ - file://embed-libs.patch \ - " -SRC_URI[md5sum] = "01710b6925a8a5ffe1a41b8b512ebd69" -SRC_URI[sha256sum] = "7e8e84cb14d2173beaca4d4cb991a14d84a4bef84ec37b2276bc363f45c52ef8" - -UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/ntop/files/ntop/Stable" - -inherit autotools-brokensep useradd python3native pkgconfig systemd - -DEPENDS = "geoip rrdtool python3 zlib libpcap gdbm" - -PACKAGECONFIG ??= "openssl snmp plugins" -PACKAGECONFIG[openssl] = "--with-ssl, --without-ssl, openssl, openssl" -PACKAGECONFIG[snmp] = "--enable-snmp=yes NETSNMP=${STAGING_BINDIR_CROSS}/net-snmp-config, \ ---disable-snmp,net-snmp," -PACKAGECONFIG[plugins] = "--enable-plugins=yes, --disable-plugins, ," - -EXTRA_OECONF += "ac_cv_file_aclocal_m4=yes ac_cv_file_depcomp=no PYTHON_CONFIG=python3-config" - -do_configure() { - cp ${STAGING_DATADIR_NATIVE}/aclocal/libtool.m4 libtool.m4.in - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S} - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/nDPI - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/nDPI - cat acinclude.m4.in acinclude.m4.ntop libtool.m4.in > acinclude.m4 - cp 3rd_party/* ./ - - # config nDPI - cd nDPI - ./configure ${CONFIGUREOPTS} --with-pic - cd .. - - sed -i -e 's:^CFG_DBFILE_DIR=$localstatedir/ntop:CFG_DBFILE_DIR=$localstatedir/lib/ntop:' ${S}/configure.in - - # fix the CFLAGS, CPPFLAGS, LDFLAGS, remove the host include - sed -i \ - -e 's:\(^CFLAGS="\$.*\) -I/usr/local/include -I/opt/local/include":\1":' \ - -e 's:\(^CPPFLAGS="\$.*\) -I/usr/local/include -I/opt/local/include":\1":' \ - -e 's:\(^LDFLAGS="\$.*\) -L/usr/local/lib -L/opt/local/lib":\1":' \ - ${S}/configure.in - - # replace the DISTRO RELEASE in configure.in which are host's - # with our release, although those doesn't affect functionality - sed -i -e \ - '/DEFINEOS="LINUX"/{N;s/DISTRO=.*/DISTRO="${DISTRO}"/;N;s/RELEASE=.*/RELEASE="${DISTRO_VERSION}"/;}' \ - ${S}/configure.in - - # osName in original configure.in should be ${TARGET_SYS} - # which will show in ntop's "show configuration" - sed -i -e \ - 's:^osName=.*:osName=${TARGET_SYS}:' \ - ${S}/configure.in - - # rename configureextra to configureextra_rename to avoid - # configure.in to guess host OS and pull in more configure, non needed - # which will cause some cross-compiling failure on specific host - # e.g. SUSE(SLED...) - test ! -f configureextra || mv -f configureextra configureextra_rename - - # make sure configure finds python includdirs/libs with these envs - export BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ - STAGING_INCDIR=${STAGING_INCDIR} \ - STAGING_LIBDIR=${STAGING_LIBDIR} - - autotools_do_configure -} - -do_compile_prepend() { - cd nDPI - oe_runmake - cd .. -} - -do_install_append() { - # remove the empty dirs - rm -rf ${D}${libdir}/plugins - - install -D -m 0755 ${S}/packages/RedHat/ntop.init \ - ${D}${sysconfdir}/init.d/ntop - install -D -m 0644 ${S}/packages/RedHat/ntop.conf.sample \ - ${D}${sysconfdir}/ntop.conf - - # change ntop dir in ntop.conf - # don't use the -P as the ntop.init didn't support it - sed -i -e "s:^--db-file-path /usr/share/ntop:--db-file-path /var/lib/ntop:" \ - -e "s:^#? -P /var/ntop:#? -P /var/lib/ntop:" \ - ${D}${sysconfdir}/ntop.conf - - # For systemd - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -D -m 0755 ${S}/packages/RedHat/ntop.init ${D}${libexecdir}/ntop-helper - install -D -m 0644 ${WORKDIR}/ntop.service ${D}${systemd_system_unitdir}/ntop.service - sed -i -e 's,@LIBEXECDIR@,${libexecdir},g' \ - -e 's,@SYSCONFDIR@,${sysconfdir},g' \ - ${D}${systemd_system_unitdir}/ntop.service - fi - - # Fix host-user-contaminated issue - chown -R root:root ${D} - - chown -R ntop.ntop ${D}${datadir}/ntop - chown -R ntop:ntop ${D}${localstatedir}/lib/ntop -} - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "-M -g ntop -r -d ${localstatedir}/lib/ntop \ --s /usr/sbin/nologin -c 'ntop' ntop" -GROUPADD_PARAM_${PN} = "-r ntop" - -SYSTEMD_SERVICE_${PN} = "ntop.service" -SYSTEMD_AUTO_ENABLE = "disable" - -FILES_${PN}_append = "${libdir}/ntop/plugins ${libdir}/libntop-*.so \ - ${libdir}/libntopreport-*.so ${libdir}/lib*-${PV}.so" -FILES_${PN}-dev = "${includedir} ${libdir}/libntop.so \ - ${libdir}/libntopreport.so \ - ${libdir}/libnetflowPlugin.so ${libdir}/libsflowPlugin.so \ - ${libdir}/librrdPlugin.so \ - ${libdir}/*.la" - diff --git a/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-Makefile.in-don-t-use-the-internal-lua.patch b/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-Makefile.in-don-t-use-the-internal-lua.patch new file mode 100644 index 000000000..46724558c --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-Makefile.in-don-t-use-the-internal-lua.patch @@ -0,0 +1,39 @@ +From 65c15247d268566b79e4595b8e734b7e40679d75 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Wed, 4 Nov 2020 08:55:10 +0000 +Subject: [PATCH] Makefile.in: don't use the internal lua + +ntopng depends on lua and it will compile the lua under +third-party sub dir of source tree, but this one supports +cross-compiling badly, so use the one under RECIPE_SYSROOT. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + Makefile.in | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 143535746..fc06a5341 100755 +--- a/Makefile.in ++++ b/Makefile.in +@@ -40,7 +40,6 @@ endif + + LUA_HOME=${PWD}/third-party/lua-5.3.5 + LUA_INC=-I$(LUA_HOME)/src +-LUA_LIB=$(LUA_HOME)/src/liblua.a + + ###### + LIBRRDTOOL_HOME=${PWD}/third-party/rrdtool-1.4.8 +@@ -118,7 +117,6 @@ RPM_PKG = $(TARGET)-$(NTOPNG_VERSION)-@REVISION@.$(PLATFORM).rpm + RPM_DATA_PKG = $(TARGET)-data-$(NTOPNG_VERSION)-@REVISION@.noarch.rpm + ###### + +-LIB_TARGETS = $(LUA_LIB) + + ifneq ($(HAS_ZEROMQ), 0) + LIB_TARGETS += $(ZEROMQ_LIB) +-- +2.26.2 + diff --git a/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-generate-configure.ac-only.patch b/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-generate-configure.ac-only.patch new file mode 100644 index 000000000..8d62147b9 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-generate-configure.ac-only.patch @@ -0,0 +1,36 @@ +From 22f0bec462763f1b0b92daa33133e274d3b45f4f Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Thu, 5 Nov 2020 00:05:21 -0800 +Subject: [PATCH] autogen.sh: generate configure.ac only + +The autogen.sh should only generate configure.ac and the +logic used to generate configure script should follow the +autotools.bbclass in oe. Otherwise there may comes below +do_configure error: + | checking whether we are cross compiling... configure: error: in `/path/tmp/work/core2-64-poky-linux/ndpi/3.4-r0/git': + | configure: error: cannot run C compiled programs. + | If you meant to cross compile, use `--host'. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + autogen.sh | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/autogen.sh b/autogen.sh +index 73f8d0ebe..15ff0aa84 100755 +--- a/autogen.sh ++++ b/autogen.sh +@@ -73,8 +73,3 @@ cat configure.seed | sed \ + > configure.ac + + rm -f config.h config.h.in *~ #* +- +-echo "Wait please..." +-autoreconf -if +-echo "" +-echo "Now run ./configure" +-- +2.17.1 + diff --git a/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-not-generate-configure.patch b/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-not-generate-configure.patch new file mode 100644 index 000000000..ffc6ec1ef --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-not-generate-configure.patch @@ -0,0 +1,33 @@ +From d482bcc8fca90afc95ac3cbe848a3c9d7ad81ddc Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Wed, 4 Nov 2020 23:37:44 -0800 +Subject: [PATCH] autogen.sh: not generate configure + +Only use autogen.sh to generate configure.ac. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + autogen.sh | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/autogen.sh b/autogen.sh +index df734ce9..d7bbf8cb 100755 +--- a/autogen.sh ++++ b/autogen.sh +@@ -52,11 +52,3 @@ cat configure.seed | sed \ + -e "s/@NDPI_VERSION_SHORT@/$NDPI_VERSION_SHORT/g" \ + -e "s/@FUZZY@/$FUZZY/g" \ + > configure.ac +- +-autoreconf -ivf +-cat configure | sed "s/#define PACKAGE/#define NDPI_PACKAGE/g" | sed "s/#define VERSION/#define NDPI_VERSION/g" > configure.tmp +-cat configure.tmp > configure +- +-chmod +x configure +-./configure $@ +- +-- +2.17.1 + diff --git a/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-configure.seed-fix-configure-error.patch b/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-configure.seed-fix-configure-error.patch new file mode 100644 index 000000000..dffab24ca --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-configure.seed-fix-configure-error.patch @@ -0,0 +1,42 @@ +From 29797dd037009d38e4976249ed21b2076240751e Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Wed, 4 Nov 2020 04:36:46 +0000 +Subject: [PATCH] configure.seed: fix configure error + +fix the below error: +configure: error: cannot run test program while cross compiling + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + configure.seed | 13 +------------ + 1 file changed, 1 insertion(+), 12 deletions(-) + +diff --git a/configure.seed b/configure.seed +index a321f9bbf..03f9a31b0 100644 +--- a/configure.seed ++++ b/configure.seed +@@ -642,18 +642,7 @@ if test x$radcli = xtrue; then + fi + fi + +-AC_CACHE_CHECK([if pthread rwlocks are supported], [my_cv_rw_locks_supported], [ +- AC_TRY_RUN([ +- #include <pthread.h> +- +- int main() { +- pthread_rwlock_t t; +- return 0; +- } +-] +-, [my_cv_rw_locks_supported=yes], [my_cv_rw_locks_supported=no]) +-] +-) ++AC_CACHE_CHECK([if pthread rwlocks are supported], [my_cv_rw_locks_supported]) + + if test "$my_cv_rw_locks_supported" = yes; then + AC_DEFINE_UNQUOTED(HAVE_RW_LOCK, 1, [pthread rwlocks supported]) +-- +2.26.2 + diff --git a/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-configure.seed-fix-host-contamination.patch b/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-configure.seed-fix-host-contamination.patch new file mode 100644 index 000000000..a5ac59fb3 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-configure.seed-fix-host-contamination.patch @@ -0,0 +1,82 @@ +From 81e3512718f80965c26ccb1f9d694c91b121fea0 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Wed, 4 Nov 2020 06:28:28 +0000 +Subject: [PATCH] configure.seed: fix host contamination + +Fix below error: +This autoconf log indicates errors, it looked at host include and/or +library paths while determining system capabilities. + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + configure.seed | 47 +++++------------------------------------------ + 1 file changed, 5 insertions(+), 42 deletions(-) + +diff --git a/configure.seed b/configure.seed +index 03f9a31b0..58aebb5b8 100644 +--- a/configure.seed ++++ b/configure.seed +@@ -79,31 +79,6 @@ fi + # + REVISION=`git log --pretty=oneline | wc -l` + +-if test -d "/usr/local/include"; then +- CFLAGS="${CFLAGS} -I/usr/local/include" +- CPPFLAGS="${CPPFLAGS} -I/usr/local/include" +-fi +- +-if test -d "/usr/local/lib"; then +- LDFLAGS="${LDFLAGS} -L/usr/local/lib" +-fi +- +-if test -d /opt/local/include; then : +- CFLAGS="${CFLAGS} -I/opt/local/include" +- CPPFLAGS="${CPPFLAGS} -I/opt/local/include" +-fi +- +-if test -d /opt/local/lib; then : +- LDFLAGS="${LDFLAGS} -L/opt/local/lib" +-fi +- +-if [ test -f /usr/bin/lsb_release ]; then +- CODENAME=`/usr/bin/lsb_release -c|cut -f 2` +- if [[ $CODENAME == "wheezy" ]]; then : +- CPPFLAGS="${CPPFLAGS} -DOLD_NETFILTER_INTERFACE=1" +- fi +-fi +- + SHORT_MACHINE=`uname -m | cut -b1-3` + + GIT_RELEASE="@GIT_RELEASE@" +@@ -214,23 +189,11 @@ dnl> fi + pkg-config --exists libssl + if test "$?" -ne 1; then + AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl]) +- SSL_INC="`pkg-config --cflags libssl` -I/usr/include/openssl" ++ SSL_INC="`pkg-config --cflags libssl`" + SSL_LIB="`pkg-config --libs libssl` -lssl -lcrypto" + else +- dnl Workaround for MacOS Brew +- if test -d "/usr/local/opt/openssl/lib"; then +- AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl]) +- SSL_INC="-I/usr/local/opt/openssl/include" +- SSL_LIB="-L/usr/local/opt/openssl/lib -lssl" +- dnl Workaround for FreeBSD +- elif test -f "/usr/lib/libssl.so"; then +- AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl]) +- SSL_INC="-I/usr/include" +- SSL_LIB="-L/usr/lib -lssl -lcrypto" +- else +- echo "Please install openssl-dev(el) package prerequisite" +- exit -1 +- fi ++ echo "Please install openssl-dev(el) package prerequisite" ++ exit -1 + fi + + AC_CHECK_LIB([gcrypt], [gcry_cipher_checktag], [LDFLAGS="${LDFLAGS} -lgcrypt"]) +-- +2.26.2 + diff --git a/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-configure.seed-not-check-clang-on-host.patch b/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-configure.seed-not-check-clang-on-host.patch new file mode 100644 index 000000000..95d1f9948 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-configure.seed-not-check-clang-on-host.patch @@ -0,0 +1,47 @@ +From eead0c589b71d4256bf9f16492164786b0ee07e4 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Mon, 9 Nov 2020 04:05:25 +0000 +Subject: [PATCH] configure.seed: not check clang on host + +Don't check clang on host to avoid host contamination. + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + configure.seed | 19 ------------------- + 1 file changed, 19 deletions(-) + +diff --git a/configure.seed b/configure.seed +index d0335b599..cb97adca2 100644 +--- a/configure.seed ++++ b/configure.seed +@@ -509,25 +509,6 @@ if test $SYSTEM = "Darwin"; then + CFLAGS="-fno-color-diagnostics $CFLAGS" + fi + fi +-else +- if test $SYSTEM = "Linux"; then +- if [ test -f /usr/bin/clang++ ]; then +- CC=clang +- CXX=clang++ +- AC_MSG_RESULT(Using clang++ compiler) +- fi +- +- if [ test -f /etc/redhat-release ]; then +- if [ test -f /usr/bin/lsb_release ]; then +- dnl> CentOS 7 +- CENTOS_N2N_DEP=", n2n" +- fi +- else +- if [ test -f /usr/bin/lsb_release ]; then +- OS=`/usr/bin/lsb_release -d|cut -d ':' -f 2` +- fi +- fi +- fi + fi + + dnl> Remove spaces +-- +2.26.2 + diff --git a/meta-openembedded/meta-networking/recipes-support/ntopng/files/ntopng.service b/meta-openembedded/meta-networking/recipes-support/ntopng/files/ntopng.service new file mode 100644 index 000000000..66912fbef --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/ntopng/files/ntopng.service @@ -0,0 +1,13 @@ +[Unit] +Description=ntopng - High-Speed Web-based Traffic Analysis and Flow Collection Tool +After=network.target + +[Service] +Type=forking +StandardOutput=syslog +StandardError=inherit +ExecStart=/usr/bin/ntopng -e -w 3000 +Restart=on-abort + +[Install] +WantedBy=multi-user.target diff --git a/meta-openembedded/meta-networking/recipes-support/ntopng/ndpi_3.4.bb b/meta-openembedded/meta-networking/recipes-support/ntopng/ndpi_3.4.bb new file mode 100644 index 000000000..1e4153779 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/ntopng/ndpi_3.4.bb @@ -0,0 +1,26 @@ +SUMMARY = "A library for deep-packet inspection." +DESCRIPTION = "nDPI is an open source LGPLv3 library for deep-packet \ +inspection. Based on OpenDPI it includes ntop extensions" + +SECTION = "libdevel" +DEPENDS = "libpcap" +RDEPENDS_${PN} += " libpcap" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=b52f2d57d10c4f7ee67a7eb9615d5d24" + +SRCREV = "64929a75e0a7a60d864bd25a9fd97fdf9ac892a2" +SRC_URI = "git://github.com/ntop/nDPI.git;branch=3.4-stable \ + file://0001-autogen.sh-not-generate-configure.patch \ +" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep pkgconfig + +do_configure_prepend() { + ${S}/autogen.sh +} + +EXTRA_OEMAKE = " \ + libdir=${libdir} \ +" diff --git a/meta-openembedded/meta-networking/recipes-support/ntopng/ntopng_4.2.bb b/meta-openembedded/meta-networking/recipes-support/ntopng/ntopng_4.2.bb new file mode 100644 index 000000000..596186651 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/ntopng/ntopng_4.2.bb @@ -0,0 +1,49 @@ +SUMMARY = "Web-based Traffic and Security Network Traffic Monitoring" +DESCRIPTION = "ntopng is a web-based network traffic monitoring application \ +released under GPLv3. It is the new incarnation of the original \ +ntop written in 1998, and now revamped in terms of performance, \ +usability, and features." + +SECTION = "console/network" + +DEPENDS = "curl libmaxminddb libpcap lua mariadb ndpi json-c rrdtool zeromq" +RDEPENDS_${PN} = "bash redis" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +SRCREV = "5e649a2d1130b4a3ab0c5bb673d615172cc0bdbb" +SRC_URI = "git://github.com/ntop/ntopng.git;protocol=git;branch=4.2-stable \ + file://0001-configure.seed-fix-configure-error.patch \ + file://0001-configure.seed-fix-host-contamination.patch \ + file://0001-Makefile.in-don-t-use-the-internal-lua.patch \ + file://0001-autogen.sh-generate-configure.ac-only.patch \ + file://0001-configure.seed-not-check-clang-on-host.patch \ + file://ntopng.service \ +" + +S = "${WORKDIR}/git" + +# don't use the lua under thirdparty as it supports cross compiling badly +export LUA_LIB = "${STAGING_LIBDIR}/liblua.a" + +LDFLAGS_append_mipsarch = " -latomic" +LDFLAGS_append_powerpc = " -latomic" +LDFLAGS_append_riscv32 = " -latomic" +inherit autotools-brokensep gettext systemd + +do_install_append() { + install -d ${D}${systemd_unitdir}/system/ + install -m 0644 ${WORKDIR}/ntopng.service ${D}${systemd_unitdir}/system +} + +FILES_${PN} += "\ + ${systemd_unitdir}/system/ntopng.service" + +FILES_${PN}-doc += "\ + /usr/man/man8/ntopng.8" + +do_configure_prepend() { + ${S}/autogen.sh +} + +SYSTEMD_SERVICE_${PN} = "ntopng.service" diff --git a/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.29.bb b/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.29.bb index 85634a70e..691848587 100644 --- a/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.29.bb +++ b/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.29.bb @@ -38,7 +38,7 @@ S = "${WORKDIR}/OpenIPMI-${PV}" SRC_URI[md5sum] = "46b452e95d69c92e4172b3673ed88d52" SRC_URI[sha256sum] = "2244124579afb14e569f34393e9ac61e658a28b6ffa8e5c0d2c1c12a8ce695cd" -inherit autotools-brokensep pkgconfig python3native perlnative update-rc.d systemd cpan-base +inherit autotools-brokensep pkgconfig python3native perlnative update-rc.d systemd cpan-base python3targetconfig EXTRA_OECONF = "--disable-static \ --with-perl='${STAGING_BINDIR_NATIVE}/perl-native/perl' \ diff --git a/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.4.9.bb b/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.5.0.bb index 529e3912b..3dc25bacd 100644 --- a/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.4.9.bb +++ b/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.5.0.bb @@ -14,8 +14,8 @@ SRC_URI = "http://swupdate.openvpn.org/community/releases/${BP}.tar.gz \ UPSTREAM_CHECK_URI = "https://openvpn.net/community-downloads" -SRC_URI[md5sum] = "52863fa9b98e5a3d7f8bec1d5785a2ba" -SRC_URI[sha256sum] = "46b268ef88e67ca6de2e9f19943eb9e5ac8544e55f5c1f3af677298d03e64b6e" +SRC_URI[md5sum] = "2d42d3c2fff942bfe9eefa41cfd6f123" +SRC_URI[sha256sum] = "87ef9f5d42c1193fec2ebd86757229b5ae4f295504968392375155adeda83b56" SYSTEMD_SERVICE_${PN} += "openvpn@loopback-server.service openvpn@loopback-client.service" SYSTEMD_AUTO_ENABLE = "disable" 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 deleted file mode 100644 index 4b2e33e9a..000000000 --- a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch +++ /dev/null @@ -1,352 +0,0 @@ -From cfcfb8a110b72b9d92cf7c56f374478f65473653 Mon Sep 17 00:00:00 2001 -From: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> -Date: Wed, 5 Aug 2020 17:21:14 +0900 -Subject: [PATCH] Remove man files which cant be built - -Remove need for pandoc-prebuilt during cross build - -Fixes errors - -| CMake Error at libibumad/man/cmake_install.cmake:105 (file): -| file INSTALL cannot find -| "/mnt/a/oe/build/tmp/work/core2-64-bec-linux-musl/rdma-core/18.1-r0/git/buildlib/pandoc-prebuilt/41bbb0bed7a781be59e8c0dcd8b7278af2ce6882". -| Call Stack (most recent call first): -| 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> - -Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> ---- - infiniband-diags/man/CMakeLists.txt | 34 ------------ - libibumad/man/CMakeLists.txt | 2 - - libibverbs/man/CMakeLists.txt | 53 ------------------- - librdmacm/man/CMakeLists.txt | 2 - - providers/efa/man/CMakeLists.txt | 2 - - providers/mlx4/man/CMakeLists.txt | 1 - - providers/mlx5/man/CMakeLists.txt | 82 ----------------------------- - 7 files changed, 176 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..857a4b8b 100644 ---- a/libibumad/man/CMakeLists.txt -+++ b/libibumad/man/CMakeLists.txt -@@ -15,7 +15,6 @@ rdma_man_pages( - umad_get_mad_addr.3 - umad_get_pkey.3 - umad_get_port.3 -- umad_init.3.md - 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 87f00185..92c68611 100644 ---- a/libibverbs/man/CMakeLists.txt -+++ b/libibverbs/man/CMakeLists.txt -@@ -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 - 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 -- ibv_create_flow_action.3.md - ibv_create_qp.3 - ibv_create_qp_ex.3 - ibv_create_rwq_ind_table.3 -@@ -27,17 +21,8 @@ rdma_man_pages( - ibv_create_wq.3 - ibv_devices.1 - ibv_devinfo.1 -- ibv_event_type_str.3.md -- ibv_fork_init.3.md - ibv_get_async_event.3 - ibv_get_cq_event.3 -- ibv_get_device_guid.3.md -- ibv_get_device_index.3.md -- 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 -@@ -52,24 +37,15 @@ rdma_man_pages( - ibv_post_srq_recv.3 - ibv_query_device.3 - ibv_query_device_ex.3 -- ibv_query_gid.3.md -- ibv_query_pkey.3.md - ibv_query_port.3 - ibv_query_qp.3 - ibv_query_rt_values_ex.3 - ibv_query_srq.3 -- 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 -- ibv_resize_cq.3.md - 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( -@@ -80,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 c3ad70a2..876b6fcf 100644 ---- a/providers/mlx5/man/CMakeLists.txt -+++ b/providers/mlx5/man/CMakeLists.txt -@@ -1,89 +1,7 @@ - rdma_man_pages( -- mlx5dv_alloc_dm.3.md -- mlx5dv_alloc_var.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_dump.3.md -- mlx5dv_flow_action_esp.3.md - mlx5dv_get_clock_info.3 - mlx5dv_init_obj.3 -- mlx5dv_is_supported.3.md -- mlx5dv_modify_qp_lag_port.3.md -- mlx5dv_open_device.3.md -- mlx5dv_pp_alloc.3.md - mlx5dv_query_device.3 -- mlx5dv_query_qp_lag_port.3.md - mlx5dv_ts_to_ns.3 -- mlx5dv_wr_post.3.md - mlx5dv.7 - ) --rdma_alias_man_pages( -- mlx5dv_alloc_var.3 mlx5dv_free_var.3 -- 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_default_miss.3 -- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_flow_meter.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_action_modify_flow_meter.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_domain_set_reclaim_device_memory.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_dump.3 mlx5dv_dump_dr_domain.3 -- mlx5dv_dump.3 mlx5dv_dump_dr_matcher.3 -- mlx5dv_dump.3 mlx5dv_dump_dr_rule.3 -- mlx5dv_dump.3 mlx5dv_dump_dr_table.3 -- mlx5dv_pp_alloc.3 mlx5dv_pp_free.3 -- mlx5dv_wr_post.3 mlx5dv_wr_set_dc_addr.3 -- mlx5dv_wr_post.3 mlx5dv_qp_ex_from_ibv_qp_ex.3 -- mlx5dv_wr_post.3 mlx5dv_wr_mr_interleaved.3 -- mlx5dv_wr_post.3 mlx5dv_wr_mr_list.3 --) --- -2.25.1 - diff --git a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_30.0.bb b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_32.0.bb index 18c34fb59..7772120ee 100644 --- a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_30.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_32.0.bb @@ -7,9 +7,8 @@ RDEPENDS_${PN} = "bash perl" 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 \ " -SRCREV = "0f4dd71d38a0f1b005635a3ff344e15791d2afa7" +SRCREV = "7a4f9ad9a1d906c5f2bbb18b588309c3d12460ac" S = "${WORKDIR}/git" #Default Dual License https://github.com/linux-rdma/rdma-core/blob/master/COPYING.md @@ -20,8 +19,11 @@ LIC_FILES_CHKSUM = "file://COPYING.BSD_FB;md5=0ec18bae1a9df92c8d6ae01f94a289ae \ EXTRA_OECMAKE = " \ -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=${systemd_system_unitdir} \ -DCMAKE_INSTALL_PERLDIR=${libdir}/perl5/${@get_perl_version(d)} \ + -DNO_MAN_PAGES=1 \ " +LTO = "" + FILES_SOLIBSDEV = "" FILES_${PN} += "${libdir}/*" INSANE_SKIP_${PN} += "dev-so" diff --git a/meta-openembedded/meta-networking/recipes-support/spice/spice_git.bb b/meta-openembedded/meta-networking/recipes-support/spice/spice_git.bb index 9d3a0e6cb..fad8b639e 100644 --- a/meta-openembedded/meta-networking/recipes-support/spice/spice_git.bb +++ b/meta-openembedded/meta-networking/recipes-support/spice/spice_git.bb @@ -32,7 +32,7 @@ S = "${WORKDIR}/git" inherit autotools gettext python3native python3-dir pkgconfig DEPENDS += "spice-protocol jpeg pixman alsa-lib glib-2.0 python3-pyparsing-native python3-six-native glib-2.0-native" -DEPENDS_append_class-nativesdk = "nativesdk-openssl" +DEPENDS_append_class-nativesdk = " nativesdk-openssl" export PYTHON="${STAGING_BINDIR_NATIVE}/python3-native/python3" diff --git a/meta-openembedded/meta-networking/recipes-support/strongswan/files/0001-Remove-obsolete-setting-regarding-the-Standard-Outpu.patch b/meta-openembedded/meta-networking/recipes-support/strongswan/files/0001-Remove-obsolete-setting-regarding-the-Standard-Outpu.patch deleted file mode 100644 index 78adcf813..000000000 --- a/meta-openembedded/meta-networking/recipes-support/strongswan/files/0001-Remove-obsolete-setting-regarding-the-Standard-Outpu.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 7b1e376d7d22244feab466e9889ba77561117357 Mon Sep 17 00:00:00 2001 -From: Mingli Yu <mingli.yu@windriver.com> -Date: Wed, 23 Sep 2020 16:20:22 +0800 -Subject: [PATCH] Remove obsolete setting regarding the Standard Output - -The Standard output type "syslog" is obsolete, causing a warning since systemd -version 246 [1]. - -Please consider using "journal" or "journal+console" - -[1] https://github.com/systemd/systemd/blob/master/NEWS#L202 - -Upstream-Status: Submitted [https://github.com/strongswan/strongswan/pull/181] - -Signed-off-by: Mingli Yu <mingli.yu@windriver.com> ---- - init/systemd-starter/strongswan-starter.service.in | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/init/systemd-starter/strongswan-starter.service.in b/init/systemd-starter/strongswan-starter.service.in -index 474284a19..6a0672352 100644 ---- a/init/systemd-starter/strongswan-starter.service.in -+++ b/init/systemd-starter/strongswan-starter.service.in -@@ -4,7 +4,6 @@ After=syslog.target network-online.target - - [Service] - ExecStart=@SBINDIR@/@IPSEC_SCRIPT@ start --nofork --StandardOutput=syslog - Restart=on-abnormal - - [Install] --- -2.17.1 - diff --git a/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.8.4.bb b/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.1.bb index 8a8809243..095a93df3 100644 --- a/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.8.4.bb +++ b/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.1.bb @@ -10,11 +10,10 @@ DEPENDS = "gmp openssl flex-native flex bison-native" SRC_URI = "http://download.strongswan.org/strongswan-${PV}.tar.bz2 \ file://fix-funtion-parameter.patch \ file://0001-memory.h-Include-stdint.h-for-uintptr_t.patch \ - file://0001-Remove-obsolete-setting-regarding-the-Standard-Outpu.patch \ " -SRC_URI[md5sum] = "0634e7f40591bd3f6770e583c3f27d29" -SRC_URI[sha256sum] = "2d9a57e33813b62d58cba07531c4d5a35c6b823dfe9b8ff7c623b6571f02553c" +SRC_URI[md5sum] = "1f4db969d072e120dc12d1c116a0f658" +SRC_URI[sha256sum] = "a337c9fb63d973b8440827755c784031648bf423b7114a04918b0b00fd42cafb" UPSTREAM_CHECK_REGEX = "strongswan-(?P<pver>\d+(\.\d+)+)\.tar" @@ -25,13 +24,15 @@ EXTRA_OECONF = " \ EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" -PACKAGECONFIG ??= "charon curl gmp openssl stroke sqlite3 \ - ${@bb.utils.filter('DISTRO_FEATURES', 'ldap', d)} \ +PACKAGECONFIG ??= "curl gmp openssl sqlite3 swanctl \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-charon', 'charon', d)} \ " PACKAGECONFIG[aesni] = "--enable-aesni,--disable-aesni,,${PN}-plugin-aesni" PACKAGECONFIG[bfd] = "--enable-bfd-backtraces,--disable-bfd-backtraces,binutils" PACKAGECONFIG[charon] = "--enable-charon,--disable-charon," PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl,${PN}-plugin-curl" +PACKAGECONFIG[eap-identity] = "--enable-eap-identity,--disable-eap-identity,,${PN}-plugin-eap-identity" +PACKAGECONFIG[eap-mschapv2] = "--enable-eap-mschapv2,--disable-eap-mschapv2,,${PN}-plugin-eap-mschapv2" PACKAGECONFIG[gmp] = "--enable-gmp,--disable-gmp,gmp,${PN}-plugin-gmp" PACKAGECONFIG[ldap] = "--enable-ldap,--disable-ldap,openldap,${PN}-plugin-ldap" PACKAGECONFIG[mysql] = "--enable-mysql,--disable-mysql,mysql5,${PN}-plugin-mysql" @@ -133,4 +134,11 @@ RDEPENDS_${PN} += "\ RPROVIDES_${PN} += "${PN}-systemd" RREPLACES_${PN} += "${PN}-systemd" RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'swanctl', '${BPN}.service', '', d)} ${BPN}-starter.service" + +# The deprecated legacy 'strongswan-starter' service should only be used when charon and +# stroke are enabled. When swanctl is in use, 'strongswan.service' is needed. +# See: https://wiki.strongswan.org/projects/strongswan/wiki/Charon-systemd +SYSTEMD_SERVICE_${PN} = " \ + ${@bb.utils.contains('PACKAGECONFIG', 'swanctl', '${BPN}.service', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'charon', '${BPN}-starter.service', '', d)} \ +" diff --git a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/0001-PPP-When-un-escaping-don-t-allocate-a-too-large-buff.patch b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/0001-PPP-When-un-escaping-don-t-allocate-a-too-large-buff.patch new file mode 100644 index 000000000..9b74e00c5 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/0001-PPP-When-un-escaping-don-t-allocate-a-too-large-buff.patch @@ -0,0 +1,70 @@ +From 32027e199368dad9508965aae8cd8de5b6ab5231 Mon Sep 17 00:00:00 2001 +From: Guy Harris <guy@alum.mit.edu> +Date: Sat, 18 Apr 2020 14:04:59 -0700 +Subject: [PATCH] PPP: When un-escaping, don't allocate a too-large buffer. + +The buffer should be big enough to hold the captured data, but it +doesn't need to be big enough to hold the entire on-the-network packet, +if we haven't captured all of it. + +(backported from commit e4add0b010ed6f2180dcb05a13026242ed935334) + +Upstream-Status: Backport +Signed-off-by: Stacy Gaikovaia <stacy.gaikovaia@windriver.com> + +--- + print-ppp.c | 18 ++++++++++++++---- + 1 file changed, 14 insertions(+), 4 deletions(-) + +diff --git a/print-ppp.c b/print-ppp.c +index 89176172..33fb0341 100644 +--- a/print-ppp.c ++++ b/print-ppp.c +@@ -1367,19 +1367,29 @@ trunc: + return 0; + } + ++/* ++ * Un-escape RFC 1662 PPP in HDLC-like framing, with octet escapes. ++ * The length argument is the on-the-wire length, not the captured ++ * length; we can only un-escape the captured part. ++ */ + static void + ppp_hdlc(netdissect_options *ndo, + const u_char *p, int length) + { ++ u_int caplen = ndo->ndo_snapend - p; + u_char *b, *t, c; + const u_char *s; +- int i, proto; ++ u_int i; ++ int proto; + const void *se; + ++ if (caplen == 0) ++ return; ++ + if (length <= 0) + return; + +- b = (u_char *)malloc(length); ++ b = (u_char *)malloc(caplen); + if (b == NULL) + return; + +@@ -1388,10 +1398,10 @@ ppp_hdlc(netdissect_options *ndo, + * Do this so that we dont overwrite the original packet + * contents. + */ +- for (s = p, t = b, i = length; i > 0 && ND_TTEST(*s); i--) { ++ for (s = p, t = b, i = caplen; i != 0; i--) { + c = *s++; + if (c == 0x7d) { +- if (i <= 1 || !ND_TTEST(*s)) ++ if (i <= 1) + break; + i--; + c = *s++ ^ 0x20; +-- +2.17.1 + diff --git a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.9.3.bb b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.9.3.bb index 94543dd1d..8f7bd59f1 100644 --- a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.9.3.bb +++ b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.9.3.bb @@ -17,6 +17,7 @@ SRC_URI = " \ file://avoid-absolute-path-when-searching-for-libdlpi.patch \ file://add-ptest.patch \ file://run-ptest \ + file://0001-PPP-When-un-escaping-don-t-allocate-a-too-large-buff.patch \ " SRC_URI[md5sum] = "a4ead41d371f91aa0a2287f589958bae" diff --git a/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute/filter-out-the-patches-from-subdirs.patch b/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute/filter-out-the-patches-from-subdirs.patch deleted file mode 100644 index 2c030b55d..000000000 --- a/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute/filter-out-the-patches-from-subdirs.patch +++ /dev/null @@ -1,47 +0,0 @@ -From e273e0ebc753645555909bcc4874c72458b17891 Mon Sep 17 00:00:00 2001 -From: Robert Yang <liezhi.yang@windriver.com> -Date: Fri, 17 Jan 2014 03:17:44 -0500 -Subject: [PATCH] Make.rules: filter-out the patches from subdirs - -The $(subdirs) contains all the dirs under the ${B}, and this one: - -do_unpack[cleandirs] = "${S}/patches" - -will create a "patches" dir, then there will be compile errors, filter -out the patches will fix the problem. - -Note: poky doesn't have this problem since it separates the ${S} and -${B} - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> ---- - Make.rules | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Make.rules b/Make.rules -index b077cd5..0bfce2d 100644 ---- a/Make.rules -+++ b/Make.rules -@@ -97,7 +97,7 @@ endif - subdirs := $(filter-out $(SKIPDIRS), $(subdirs)) - endif - --install install-%: subdirs := $(filter-out $(SKIPINSTALL), $(subdirs)) -+install install-%: subdirs := $(filter-out $(SKIPINSTALL) patches, $(subdirs)) - - - override MAKE += srcdir=$(srcdir) subdirs="$(subdirs)" shared=$(shared) -@@ -106,7 +106,7 @@ override MAKE += srcdir=$(srcdir) subdirs="$(subdirs)" shared=$(shared) - INCLUDEDIRS := $(filter $(INCLUDEDIRS), $(subdirs)) - LIBDIRS := $(filter $(LIBDIRS), $(subdirs)) - MODDIRS := $(filter $(MODDIRS), $(subdirs)) --EXEDIRS := $(filter-out $(INCLUDEDIRS) $(LIBDIRS) $(MODDIRS), $(subdirs)) -+EXEDIRS := $(filter-out $(INCLUDEDIRS) $(LIBDIRS) $(MODDIRS) patches, $(subdirs)) - MODUSERS := $(filter $(MODUSERS), $(subdirs)) - SBINUSERS := $(filter $(SBINUSERS), $(subdirs)) - --- -1.7.10.4 - diff --git a/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.0.bb b/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.0.bb index 19bbf03f1..993794492 100644 --- a/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.0.bb @@ -16,16 +16,14 @@ inherit update-alternatives UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/traceroute/files/traceroute/" SRC_URI = "${SOURCEFORGE_MIRROR}/traceroute/traceroute/${BP}/${BP}.tar.gz \ - file://filter-out-the-patches-from-subdirs.patch \ " - SRC_URI[md5sum] = "84d329d67abc3fb83fc8cb12aeaddaba" SRC_URI[sha256sum] = "3669d22a34d3f38ed50caba18cd525ba55c5c00d5465f2d20d7472e5d81603b6" EXTRA_OEMAKE = "VPATH=${STAGING_LIBDIR}" +LTOEXTRA += "-flto-partition=none" do_compile() { - export LDFLAGS="${TARGET_LDFLAGS} -L${S}/libsupp" oe_runmake "env=yes" } diff --git a/meta-openembedded/meta-networking/recipes-support/unbound/unbound/0001-contrib-add-yocto-compatible-init-script.patch b/meta-openembedded/meta-networking/recipes-support/unbound/unbound/0001-contrib-add-yocto-compatible-init-script.patch new file mode 100644 index 000000000..7168a352f --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/unbound/unbound/0001-contrib-add-yocto-compatible-init-script.patch @@ -0,0 +1,78 @@ +From 26614b6578056ec30b95013592e308bf24d924c2 Mon Sep 17 00:00:00 2001 +From: Beniamin Sandu <beniaminsandu@gmail.com> +Date: Fri, 20 Nov 2020 23:00:20 +0200 +Subject: [PATCH] contrib: add yocto compatible init script + +Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com> +--- + contrib/unbound.init | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +diff --git a/contrib/unbound.init b/contrib/unbound.init +index c5bb52bb..4eba752b 100644 +--- a/contrib/unbound.init ++++ b/contrib/unbound.init +@@ -19,11 +19,11 @@ + ### END INIT INFO + + # Source function library. +-. /etc/rc.d/init.d/functions ++. /etc/init.d/functions + + exec="/usr/sbin/unbound" + prog="unbound" +-config="/var/unbound/unbound.conf" ++config="/etc/unbound/unbound.conf" + pidfile="/var/unbound/unbound.pid" + rootdir="/var/unbound" + +@@ -54,14 +54,14 @@ start() { + [ -e ${rootdir}/dev/log ] || touch ${rootdir}/dev/log + mount --bind -n /dev/log ${rootdir}/dev/log >/dev/null 2>&1; + fi; +- if ! egrep -q '^/[^[:space:]]+[[:space:]]+'${rootdir}'/dev/urandom' /proc/mounts; then ++ if ! egrep -q '^/[^[:space:]]+[[:space:]]+'${rootdir}'/dev/random' /proc/mounts; then + [ -d ${rootdir}/dev ] || mkdir -p ${rootdir}/dev ; +- [ -e ${rootdir}/dev/urandom ] || touch ${rootdir}/dev/urandom +- mount --bind -n /dev/urandom ${rootdir}/dev/urandom >/dev/null 2>&1; ++ [ -e ${rootdir}/dev/random ] || touch ${rootdir}/dev/random ++ mount --bind -n /dev/random ${rootdir}/dev/random >/dev/null 2>&1; + fi; + + # if not running, start it up here +- daemon $exec ++ daemonize $exec + retval=$? + echo + [ $retval -eq 0 ] && touch $lockfile +@@ -71,15 +71,15 @@ start() { + stop() { + echo -n $"Stopping $prog: " + # stop it here, often "killproc $prog" +- killproc -p $pidfile $prog ++ killproc $prog + retval=$? + echo + [ $retval -eq 0 ] && rm -f $lockfile + if egrep -q '^/[^[:space:]]+[[:space:]]+'${rootdir}'/dev/log' /proc/mounts; then + umount ${rootdir}/dev/log >/dev/null 2>&1 + fi; +- if egrep -q '^/[^[:space:]]+[[:space:]]+'${rootdir}'/dev/urandom' /proc/mounts; then +- umount ${rootdir}/dev/urandom >/dev/null 2>&1 ++ if egrep -q '^/[^[:space:]]+[[:space:]]+'${rootdir}'/dev/random' /proc/mounts; then ++ umount ${rootdir}/dev/random >/dev/null 2>&1 + fi; + return $retval + } +@@ -99,7 +99,7 @@ force_reload() { + + rh_status() { + # run checks to determine if the service is running or use generic status +- status -p $pidfile $prog ++ status $prog + } + + rh_status_q() { +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-support/unbound/unbound/0001-contrib-add-yocto-compatible-startup-scripts.patch b/meta-openembedded/meta-networking/recipes-support/unbound/unbound/0001-contrib-add-yocto-compatible-startup-scripts.patch deleted file mode 100644 index 46f6a7b3f..000000000 --- a/meta-openembedded/meta-networking/recipes-support/unbound/unbound/0001-contrib-add-yocto-compatible-startup-scripts.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 186ac39de8eb9aedcf3d87cdbe389d10cde03d66 Mon Sep 17 00:00:00 2001 -From: Beniamin Sandu <beniaminsandu@gmail.com> -Date: Tue, 16 Jul 2019 19:59:23 +0300 -Subject: [PATCH] contrib: add yocto compatible startup scripts - -Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com> ---- - contrib/unbound.init | 10 +++++----- - contrib/unbound.service.in | 4 ++-- - 2 files changed, 7 insertions(+), 7 deletions(-) - mode change 100644 => 100755 contrib/unbound.init - -diff --git a/contrib/unbound.init b/contrib/unbound.init -old mode 100644 -new mode 100755 -index cccadecc..4eba752b ---- a/contrib/unbound.init -+++ b/contrib/unbound.init -@@ -19,11 +19,11 @@ - ### END INIT INFO - - # Source function library. --. /etc/rc.d/init.d/functions -+. /etc/init.d/functions - - exec="/usr/sbin/unbound" - prog="unbound" --config="/var/unbound/unbound.conf" -+config="/etc/unbound/unbound.conf" - pidfile="/var/unbound/unbound.pid" - rootdir="/var/unbound" - -@@ -61,7 +61,7 @@ start() { - fi; - - # if not running, start it up here -- daemon $exec -+ daemonize $exec - retval=$? - echo - [ $retval -eq 0 ] && touch $lockfile -@@ -71,7 +71,7 @@ start() { - stop() { - echo -n $"Stopping $prog: " - # stop it here, often "killproc $prog" -- killproc -p $pidfile $prog -+ killproc $prog - retval=$? - echo - [ $retval -eq 0 ] && rm -f $lockfile -@@ -99,7 +99,7 @@ force_reload() { - - rh_status() { - # run checks to determine if the service is running or use generic status -- status -p $pidfile $prog -+ status $prog - } - - rh_status_q() { -diff --git a/contrib/unbound.service.in b/contrib/unbound.service.in -index 95976dd9..0e7f79a9 100644 ---- a/contrib/unbound.service.in -+++ b/contrib/unbound.service.in -@@ -10,9 +10,9 @@ WantedBy=multi-user.target - - [Service] - ExecReload=/bin/kill -HUP $MAINPID --ExecStart=@UNBOUND_SBIN_DIR@/unbound -+ExecStart=@UNBOUND_SBIN_DIR@/unbound -d - NotifyAccess=main --Type=notify -+Type=simple - CapabilityBoundingSet=CAP_IPC_LOCK CAP_NET_BIND_SERVICE CAP_SETGID CAP_SETUID CAP_SYS_CHROOT CAP_SYS_RESOURCE - MemoryDenyWriteExecute=true - NoNewPrivileges=true --- -2.17.1 - diff --git a/meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.9.4.bb b/meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.12.0.bb index 6200214ac..6fc163171 100644 --- a/meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.9.4.bb +++ b/meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.12.0.bb @@ -10,9 +10,9 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=5308494bc0590c0cb036afd781d78f06" SRC_URI = "git://github.com/NLnetLabs/unbound.git;protocol=http;branch=master \ - file://0001-contrib-add-yocto-compatible-startup-scripts.patch \ + file://0001-contrib-add-yocto-compatible-init-script.patch \ " -SRCREV="b60c4a472c856f0a98120b7259e991b3a6507eb5" +SRCREV="52b04806f4236c37acd10179ab465a54adc7e86a" inherit autotools pkgconfig systemd update-rc.d |