diff --git a/common/shlibs b/common/shlibs index 312a7b0ba0ad8c..7f04c88edcdd64 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3741,7 +3741,7 @@ libvalapanel.so.0 vala-panel-0.4.87_1 libappmenu-gtk3-parser.so.0 appmenu-gtk3-module-0.7.1_1 libqhttpengine.so.1 qhttpengine-1.0.1_1 libqmdnsengine.so.0 qmdnsengine-0.1.0_1 -libyang.so.1 libyang-1.0r5_1 +libyang.so.3 libyang-3.13.6_1 libhtp.so.2 libhtp-0.5.30_1 libgedit-50.so gedit-50.0_1 libgedit-amtk-5.so.0 libgedit-amtk-5.8.0_1 diff --git a/srcpkgs/frr/patches/python-3.13.patch b/srcpkgs/frr/patches/python-3.13.patch deleted file mode 100644 index 519c75786fd043..00000000000000 --- a/srcpkgs/frr/patches/python-3.13.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 9fcc2ae596a1eabfb0b7e663b5d47fa58a124bc2 Mon Sep 17 00:00:00 2001 -From: David Lamparter -Date: Wed, 15 Mar 2023 12:24:36 +0100 -Subject: [PATCH] lib: adapt clippy to Python 3.8+ init API - -The old initialization/config API is deprecated in Python 3.11. Make -clippy use the new one added in 3.8 if it's that version or newer. - -Signed-off-by: David Lamparter ---- - lib/clippy.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 48 insertions(+) - -diff --git a/lib/clippy.c b/lib/clippy.c -index c3c9f5c4016d..d414053c5538 100644 ---- a/lib/clippy.c -+++ b/lib/clippy.c -@@ -14,6 +14,53 @@ - #include "command_graph.h" - #include "clippy.h" - -+#if PY_VERSION_HEX >= 0x03080000 -+/* new python init/config API added in Python 3.8 */ -+int main(int argc, char **argv) -+{ -+ PyStatus status; -+ PyPreConfig preconfig[1]; -+ PyConfig config[1]; -+ -+ PyPreConfig_InitPythonConfig(preconfig); -+ preconfig->configure_locale = 0; -+ preconfig->coerce_c_locale = 1; -+ preconfig->coerce_c_locale_warn = 0; -+ preconfig->isolated = 0; -+ preconfig->utf8_mode = 1; -+ preconfig->parse_argv = 0; -+ -+ status = Py_PreInitializeFromBytesArgs(preconfig, argc, argv); -+ if (PyStatus_Exception(status)) -+ Py_ExitStatusException(status); -+ -+ PyConfig_InitPythonConfig(config); -+#if PY_VERSION_HEX >= 0x030b0000 /* 3.11 */ -+ config->safe_path = 0; -+#endif -+ -+ status = PyConfig_SetBytesArgv(config, argc, argv); -+ if (PyStatus_Exception(status)) -+ Py_ExitStatusException(status); -+ -+ PyConfig_SetBytesString(config, &config->program_name, -+ argc > 0 ? argv[0] : "clippy"); -+ if (argc > 1) -+ PyConfig_SetBytesString(config, &config->run_filename, argv[1]); -+ -+ PyImport_AppendInittab("_clippy", command_py_init); -+ -+ status = Py_InitializeFromConfig(config); -+ if (PyStatus_Exception(status)) -+ Py_ExitStatusException(status); -+ -+ PyConfig_Clear(config); -+ -+ return Py_RunMain(); -+} -+ -+#else /* Python < 3.8 */ -+/* old python init/config API, deprecated in Python 3.11 */ - #if PY_MAJOR_VERSION >= 3 - #define pychar wchar_t - static wchar_t *wconv(const char *s) -@@ -89,6 +136,7 @@ int main(int argc, char **argv) - free(wargv); - return 0; - } -+#endif /* Python < 3.8 */ - - /* and now for the ugly part... provide simplified logging functions so we - * don't need to link libzebra (which would be a circular build dep) */ diff --git a/srcpkgs/frr/template b/srcpkgs/frr/template index 56a5253393c568..3a0ec50567d225 100644 --- a/srcpkgs/frr/template +++ b/srcpkgs/frr/template @@ -1,27 +1,26 @@ # Template file for 'frr' pkgname=frr -version=7.5 -revision=8 +version=10.7.0 +revision=1 build_style=gnu-configure # chroot-texinfo is not able to build frr's docs -configure_args="--disable-doc - --localstatedir=/run/frr --sysconfdir=/etc/frr - --enable-exampledir=/usr/share/examples/frr - --enable-user=_frr --enable-group=_frr --enable-vty-group=_frrvty" +configure_args="--disable-doc --localstatedir=/run/frr --sysconfdir=/etc/frr + --enable-exampledir=/usr/share/examples/frr --enable-vty-group=_frrvty + --enable-user=_frr --enable-group=_frr" make_build_args="SPHINXBUILD=sphinx-build" conf_files="/etc/frr/*.conf" make_dirs="/var/log/frr 0700 _frr _frr" -hostmakedepends="pkg-config flex bison autoconf automake libtool - python3 python3-Sphinx python3-devel libyang-tools" +hostmakedepends="pkg-config flex bison autoconf automake libtool libyang-tools + python3 python3-Sphinx protobuf protobuf-c" makedepends="pcre-devel libcap-devel json-c-devel pam-devel c-ares-devel - readline-devel python3-devel libyang-devel" + readline-devel python3-devel libyang-devel elfutils-devel protobuf-c-devel" checkdepends="python3-pytest" short_desc="IP routing protocol suite" maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://frrouting.org" -distfiles="https://github.com/FRRouting/frr/archive/${pkgname}-${version}.tar.gz" -checksum=54066e82a82751ec5876d9b67aa0cb24fe94e19e7371af290ac25099eda9f136 +distfiles="https://github.com/FRRouting/frr/archive/refs/tags/frr-${version}.tar.gz" +checksum=5c56b27756854b8d0a62b3e152d3f9ea08091851b2d686e140fdfb95cd88f612 conflicts="babeld" python_version=3 system_groups="_frrvty" @@ -49,6 +48,12 @@ pre_configure() { } post_install() { + rm -f \ + "${DESTDIR}/usr/share/yang/ietf-interfaces.yang" \ + "${DESTDIR}/usr/share/yang/ietf-netconf-acm.yang" \ + "${DESTDIR}/usr/share/yang/ietf-netconf-with-defaults.yang" \ + "${DESTDIR}/usr/share/yang/ietf-netconf.yang" + if [ -z "$CROSS_BUILD" ]; then # install build tool to be used by cross builds vinstall lib/clippy 0755 usr/libexec/frr-devel @@ -113,9 +118,7 @@ libfrr-devel_package() { short_desc+=" - client library (development files)" depends="${pkgname%-devel}-${version}_${revision}" pkg_install() { - vmove "usr/include/frr/*.h" - vmove usr/include/frr/ospfd - vmove usr/include/frr/eigrpd + vmove usr/include/frr vmove usr/lib/libfrr.so vmove usr/lib/libfrr.a vmove usr/lib/libfrrcares.so diff --git a/srcpkgs/libyang/template b/srcpkgs/libyang/template index a5f62742a91d93..f5381417dba1c3 100644 --- a/srcpkgs/libyang/template +++ b/srcpkgs/libyang/template @@ -1,17 +1,16 @@ # Template file for 'libyang' pkgname=libyang -version=1.0.215 +version=3.13.6 revision=1 build_style=cmake -configure_args="-DENABLE_LYD_PRIV=ON" hostmakedepends="doxygen pkg-config" -makedepends="pcre-devel" +makedepends="pcre2-devel" short_desc="YANG data modeling language library" maintainer="Orphaned " license="BSD-3-Clause" homepage="https://github.com/CESNET/libyang" -distfiles="https://github.com/CESNET/libyang/archive/v${version}.tar.gz" -checksum=c4498a77a7c12a28c9911f993eeafbf2badd2ecea58bb74781bd61cfc635e4c9 +distfiles="https://github.com/CESNET/libyang/archive/refs/tags/v${version}.tar.gz" +checksum=5cd5018f39c830f97d70616c003990287ce5e820ae2792763a49e2a1f63af8d6 post_install() { vlicense LICENSE