summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb1
-rw-r--r--meta-networking/recipes-support/netcf/netcf/0001-Adopt-to-new-gnulib-read_file-fread_file-signature.patch94
-rw-r--r--meta-networking/recipes-support/netcf/netcf/0001-netcf-fix-bootstrap-with-newer-gnulib-automake.patch61
-rw-r--r--meta-networking/recipes-support/netcf/netcf_0.2.8.bb73
4 files changed, 0 insertions, 229 deletions
diff --git a/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb b/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb
index cc0445aaed..21c9dce4e1 100644
--- a/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb
+++ b/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb
@@ -216,7 +216,6 @@ RDEPENDS:packagegroup-meta-networking-support = "\
216 ndisc6 \ 216 ndisc6 \
217 tcpdump \ 217 tcpdump \
218 tcpslice \ 218 tcpslice \
219 netcf \
220 tnftp \ 219 tnftp \
221 traceroute \ 220 traceroute \
222 tunctl \ 221 tunctl \
diff --git a/meta-networking/recipes-support/netcf/netcf/0001-Adopt-to-new-gnulib-read_file-fread_file-signature.patch b/meta-networking/recipes-support/netcf/netcf/0001-Adopt-to-new-gnulib-read_file-fread_file-signature.patch
deleted file mode 100644
index 83fdfded52..0000000000
--- a/meta-networking/recipes-support/netcf/netcf/0001-Adopt-to-new-gnulib-read_file-fread_file-signature.patch
+++ /dev/null
@@ -1,94 +0,0 @@
1From af256680926e166ac21bc0f11172ea6c077a9b55 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 9 Mar 2024 10:40:48 -0800
4Subject: [PATCH] Adopt to new gnulib read_file/fread_file signature
5
6It now expects a flag parameter in latest gnulib
7see [1]
8
9[1] https://public-inbox.org/bug-gnulib/87tv01c1z2.fsf-ueno@gnu.org/
10
11Upstream-Status: Pending
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13---
14 src/dutil_linux.c | 4 ++--
15 src/dutil_posix.c | 2 +-
16 src/ncftool.c | 2 +-
17 src/ncftransform.c | 2 +-
18 4 files changed, 5 insertions(+), 5 deletions(-)
19
20--- a/src/dutil_linux.c
21+++ b/src/dutil_linux.c
22@@ -1113,7 +1113,7 @@ static void add_link_info(struct netcf *
23
24 xasprintf(&path, "/sys/class/net/%s/operstate", ifname);
25 ERR_NOMEM(!path, ncf);
26- state = read_file(path, &length);
27+ state = read_file(path, 0, &length);
28 if (!state) {
29 /* missing operstate is *not* an error. It could be due to an
30 * alias interface, which has no entry in /sys/class/net at
31@@ -1132,7 +1132,7 @@ static void add_link_info(struct netcf *
32 FREE(path);
33 xasprintf(&path, "/sys/class/net/%s/speed", ifname);
34 ERR_NOMEM(path == NULL, ncf);
35- speed = read_file(path, &length);
36+ speed = read_file(path, 0, &length);
37 if (!speed && errno == EINVAL) {
38 /* attempts to read $ifname/speed result in EINVAL if the
39 * interface is ifconfiged down (which isn't exactly the
40--- a/src/dutil_posix.c
41+++ b/src/dutil_posix.c
42@@ -211,7 +211,7 @@ int run_program(struct netcf *ncf, const
43 "Failed to create file stream for output while executing '%s': %s",
44 argv_str, errbuf);
45
46- *output = fread_file(outfile, &outlen);
47+ *output = fread_file(outfile, 0, &outlen);
48 ERR_THROW_STRERROR(*output == NULL, ncf, EEXEC,
49 "Error while reading output from execution of '%s': %s",
50 argv_str, errbuf);
51--- a/src/ncftool.c
52+++ b/src/ncftool.c
53@@ -351,7 +351,7 @@ static int cmd_define(const struct comma
54 struct netcf_if *nif = NULL;
55 int result = CMD_RES_ERR;
56
57- xml = read_file(fname, &length);
58+ xml = read_file(fname, 0, &length);
59 if (xml == NULL) {
60 fprintf(stderr, "Failed to read %s\n", fname);
61 goto done;
62--- a/src/ncftransform.c
63+++ b/src/ncftransform.c
64@@ -54,7 +54,7 @@ int main(int argc, char **argv) {
65 if (argc != 3 || (STRNEQ(argv[1], "get") && STRNEQ(argv[1], "put")))
66 die("Usage: ncftransform (put|get) FILE\n");
67
68- in_xml = read_file(argv[2], &length);
69+ in_xml = read_file(argv[2], 0, &length);
70 if (in_xml == NULL)
71 die("Failed to read %s\n", argv[2]);
72
73--- a/src/internal.h
74+++ b/src/internal.h
75@@ -30,6 +30,7 @@
76
77 #include <string.h>
78 #include <stdarg.h>
79+#include <stdlib.h>
80
81 #include <libxslt/transform.h>
82 #include <libxml/relaxng.h>
83@@ -85,6 +86,11 @@
84 #define ATTRIBUTE_NOINLINE
85 #endif /* __GNUC__ */
86
87+#ifndef REALLOC_N
88+# define REALLOC_N(ptr, count) \
89+ (((ptr) = realloc((ptr), sizeof(*(ptr)) * (count))) == NULL ? -1 : 0)
90+#endif
91+
92 /* This needs ATTRIBUTE_RETURN_CHECK */
93 #include "ref.h"
94
diff --git a/meta-networking/recipes-support/netcf/netcf/0001-netcf-fix-bootstrap-with-newer-gnulib-automake.patch b/meta-networking/recipes-support/netcf/netcf/0001-netcf-fix-bootstrap-with-newer-gnulib-automake.patch
deleted file mode 100644
index 62daeff812..0000000000
--- a/meta-networking/recipes-support/netcf/netcf/0001-netcf-fix-bootstrap-with-newer-gnulib-automake.patch
+++ /dev/null
@@ -1,61 +0,0 @@
1From dded6e3321e304f50922e61c553d4e4eb0f80fd0 Mon Sep 17 00:00:00 2001
2From: Khem Raj <khem.raj@oss.qualcomm.com>
3Date: Sun, 22 Mar 2026 11:05:34 -0700
4Subject: [PATCH] netcf: fix bootstrap with newer gnulib/automake
5
6Upstream netcf is old enough that bootstrap/autoreconf now trips over:
7- gnulib-tool.py wrapper expectations in newer gnulib
8- stricter automake handling of AM_CFLAGS += from generated gnulib.mk
9- subdir source warnings
10- deprecated INCLUDES usage
11
12Upstream-Status: Pending
13Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
14---
15 configure.ac | 2 +-
16 gnulib/lib/Makefile.am | 2 +-
17 gnulib/tests/Makefile.am | 2 ++
18 tests/Makefile.am | 2 +-
19 4 files changed, 5 insertions(+), 3 deletions(-)
20
21--- a/configure.ac
22+++ b/configure.ac
23@@ -3,7 +3,7 @@ AC_CONFIG_SRCDIR([src/netcf.c])
24 AC_CONFIG_AUX_DIR([build-aux])
25 AC_CONFIG_MACRO_DIR([gnulib/m4])
26 AC_CONFIG_HEADERS([config.h])
27-AM_INIT_AUTOMAKE([-Wno-portability 1.11 color-tests parallel-tests])
28+AM_INIT_AUTOMAKE([-Wno-portability 1.11 subdir-objects color-tests parallel-tests])
29 AM_SILENT_RULES([yes]) # make --enable-silent-rules the default.
30 AC_CANONICAL_HOST
31
32--- a/gnulib/lib/Makefile.am
33+++ b/gnulib/lib/Makefile.am
34@@ -13,4 +13,4 @@ CLEANFILES=
35
36 include gnulib.mk
37
38-INCLUDES = $(GETTEXT_CPPFLAGS)
39+AM_CPPFLAGS = $(GETTEXT_CPPFLAGS)
40--- a/gnulib/tests/Makefile.am
41+++ b/gnulib/tests/Makefile.am
42@@ -3,6 +3,6 @@
43 ## Copyright (C) 2011 Red Hat, Inc.
44 ## See COPYING.LIB for the License of this software
45
46-include gnulib.mk
47+AM_CFLAGS =
48
49-INCLUDES = $(GETTEXT_CPPFLAGS)
50+include gnulib.mk
51--- a/tests/Makefile.am
52+++ b/tests/Makefile.am
53@@ -14,7 +14,7 @@ TESTS_ENVIRONMENT = \
54 abs_top_builddir='$(abs_top_builddir)' \
55 abs_top_srcdir='$(abs_top_srcdir)'
56
57-INCLUDES = -I$(top_srcdir)/src
58+AM_CPPFLAGS = -I$(top_srcdir)/src
59
60 TESTS=
61 check_PROGRAMS=
diff --git a/meta-networking/recipes-support/netcf/netcf_0.2.8.bb b/meta-networking/recipes-support/netcf/netcf_0.2.8.bb
deleted file mode 100644
index a73531de82..0000000000
--- a/meta-networking/recipes-support/netcf/netcf_0.2.8.bb
+++ /dev/null
@@ -1,73 +0,0 @@
1SUMMARY = "netcf"
2DESCRIPTION = "netcf is a cross-platform network configuration library."
3HOMEPAGE = "https://pagure.io/netcf"
4SECTION = "libs"
5LICENSE = "LGPL-2.1-only"
6
7LIC_FILES_CHKSUM = "file://COPYING;md5=fb919cc88dbe06ec0b0bd50e001ccf1f"
8
9SRCREV = "2c5d4255857531bc09d91dcd02e86545f29004d4"
10PV .= "+git"
11
12SRC_URI = "git://pagure.io/netcf.git;protocol=https;branch=master \
13 file://0001-netcf-fix-bootstrap-with-newer-gnulib-automake.patch \
14 file://0001-Adopt-to-new-gnulib-read_file-fread_file-signature.patch"
15
16UPSTREAM_CHECK_GITTAGREGEX = "release-(?P<pver>(\d+(\.\d+)+))"
17
18DEPENDS += "augeas libnl libxslt libxml2"
19
20do_configure[depends] += "${MLPREFIX}gnulib:do_populate_sysroot"
21
22
23inherit gettext autotools perlnative pkgconfig systemd
24
25EXTRA_OECONF:append:class-target = " --with-driver=redhat"
26
27PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
28PACKAGECONFIG[systemd] = "--with-sysinit=systemd,--with-sysinit=initscripts,"
29
30do_configure:prepend() {
31 currdir=`pwd`
32 cd ${S}
33
34 # avoid bootstrap cloning gnulib on every configure
35 # the dir starts out empty from the pkg, but unconditionally blow it
36 # away so if we reconfigure due to gnulib sysroot sig changes, we will
37 # get the newer gnulib content into the build here.
38 rm -rf ${S}/.gnulib
39 cp -rf ${STAGING_DATADIR}/gnulib ${S}/.gnulib
40
41 # --force to avoid errors on reconfigure e.g if recipes changed we depend on
42 # | bootstrap: running: libtoolize --quiet
43 # | libtoolize: error: 'libltdl/COPYING.LIB' exists: use '--force' to overwrite
44 # | ...
45 ./bootstrap --force --no-git --gnulib-srcdir=.gnulib
46
47 cd $currdir
48}
49
50do_install:append() {
51 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
52 install -d ${D}${systemd_unitdir}/system
53 if [ -d "${D}${libdir}/systemd/system" ]; then
54 if [ "${systemd_unitdir}" != "${libdir}/systemd" ] ; then
55 mv ${D}${libdir}/systemd/system/* ${D}${systemd_unitdir}/system/
56 rm -rf ${D}${libdir}/systemd/
57 fi
58 elif [ "${systemd_unitdir}" != "${nonarch_libdir}/systemd" ] ; then
59 mv ${D}${nonarch_libdir}/systemd/system/* ${D}${systemd_unitdir}/system/
60 rm -rf ${D}${nonarch_libdir}/systemd/
61 fi
62 else
63 mv ${D}${sysconfdir}/rc.d/init.d/ ${D}${sysconfdir}
64 rm -rf ${D}${sysconfdir}/rc.d/
65 fi
66}
67
68FILES:${PN} += " \
69 ${libdir} \
70 ${nonarch_libdir} \
71 "
72
73SYSTEMD_SERVICE:${PN} = "netcf-transaction.service"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-04-22 22:00:40 +0000