[git.ipfire.org] IPFire 3.x development tree branch, master, updated. ec1a44000bb5904cc2f7ca433a27de9a701424b6
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".
The branch, master has been updated via ec1a44000bb5904cc2f7ca433a27de9a701424b6 (commit) via 92c1174eda88b2ca03c4809d18d7ddf92ec6a8a1 (commit) via e67fefb88a538fdd1a42d1fed551940d958c3238 (commit) via 53e5dc5761a663da32ed40a91118599cc2504d62 (commit) via 14e406f6d8f23324ee53e89e9256e75f78852a50 (commit) via b5c4e58a62562328870dcc21893353bf9ec06fc0 (commit) via 953c35d8acb5f96b4ca5a638f73519befc6ca848 (commit) via 97ff7bf2426b2d6af2e06abd8e37d894beaee032 (commit) via e2f2934872c169a14132416a832e7f06b9ff8d3f (commit) via 22744497b80430842c1785ccdbe4328cdd5f18d6 (commit) via e997f040028c750f9ff830ce9426d84495bf635a (commit) via 782b195edda9d0c0115fc212869db20b4c8138d9 (commit) via abe3be0786b0e23990ceafe40375079f5caed2b4 (commit) via 443829670ef5004bfff4586638609974a7336f63 (commit) via a7e01b7b1d36efa33da6edf871550bb33492700b (commit) via 0d4e5e68bcbf98859abdfaf8ebf1b40f6b7f65c1 (commit) via 9e131a474f65d3db81d5bffe951afbdd9ebdb79c (commit) via 0ae2e1291d3c083331a37aedb3f9b745f7d2b552 (commit) via 6a9cfbed6d20792d6d40566439719453ace527c5 (commit) via 04f3b9352112396e2e78c4a55474973c34edbf70 (commit) via 8ac23d1f1e9a44db518e076b6f85363d61d79d3b (commit) via 5b8f009e7d7e633ba2717b9ecca531855232d1a1 (commit) via 28243e1054c15125731b8a12b3da585126875787 (commit) via 1d860c35cc5252a66f9067d141aa48a9f55e1ef6 (commit) via 75fc71f8bdd59ecbbd624140c90242841daa7226 (commit) via 2e761221467a0844aa8c78600592ee3d6854c7c5 (commit) via 9d0dd61b0ea404d4cb5c7ffc61ea0c8f4086cdb4 (commit) via ca0b6c144c97ebbff76d72cb8f4bb01583cc4d90 (commit) via 786d27c8b0cd1937e6d5721b7a0bd80d4ae39c4e (commit) from a13ee144617e5c672368816c58706aa36235e1f7 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit ec1a44000bb5904cc2f7ca433a27de9a701424b6 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Feb 23 11:30:35 2025 +0000
gnutls: Link against libidn2
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 92c1174eda88b2ca03c4809d18d7ddf92ec6a8a1 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Feb 23 11:29:49 2025 +0000
ghostscript: Update to 10.04.0
This patch also fixes the GitHub download URL.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit e67fefb88a538fdd1a42d1fed551940d958c3238 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Feb 22 23:08:38 2025 +0000
systemd: Don't depend on libidn*-devel
Neither of the libraries is being used.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 53e5dc5761a663da32ed40a91118599cc2504d62 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Feb 22 22:58:15 2025 +0000
wget: Link against libidn2 and pcre2
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 14e406f6d8f23324ee53e89e9256e75f78852a50 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Feb 22 22:53:24 2025 +0000
elinks: Update to 0.18.0
Also update to libidn2.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit b5c4e58a62562328870dcc21893353bf9ec06fc0 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Feb 22 22:53:01 2025 +0000
pdns: Update to 4.9.4
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 953c35d8acb5f96b4ca5a638f73519befc6ca848 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Feb 22 22:52:37 2025 +0000
boost: Update download URL
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 97ff7bf2426b2d6af2e06abd8e37d894beaee032 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Feb 22 22:35:12 2025 +0000
rrdtool: Update to 1.9.0
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit e2f2934872c169a14132416a832e7f06b9ff8d3f Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Feb 22 22:33:10 2025 +0000
hyperscan: Fix GitHub download URL
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 22744497b80430842c1785ccdbe4328cdd5f18d6 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Feb 22 22:31:58 2025 +0000
less: Link against PCRE2 instead of PCRE
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit e997f040028c750f9ff830ce9426d84495bf635a Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Feb 22 21:45:54 2025 +0000
openssh: Update to 9.9p2
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 782b195edda9d0c0115fc212869db20b4c8138d9 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Feb 22 21:38:15 2025 +0000
memtest86+: Fix GitHub download URL
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit abe3be0786b0e23990ceafe40375079f5caed2b4 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Feb 22 21:30:41 2025 +0000
intel-microcode: Update to 20250211
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 443829670ef5004bfff4586638609974a7336f63 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Feb 22 21:26:13 2025 +0000
ninja: Update to 1.12.1
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit a7e01b7b1d36efa33da6edf871550bb33492700b Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Feb 22 21:25:49 2025 +0000
libinih: Update to version 58
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 0d4e5e68bcbf98859abdfaf8ebf1b40f6b7f65c1 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Feb 22 21:25:33 2025 +0000
meson: Update to version 1.7.0
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 9e131a474f65d3db81d5bffe951afbdd9ebdb79c Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Feb 16 16:28:16 2025 +0000
bricklayer: Depend on Pakfire's Python module
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 0ae2e1291d3c083331a37aedb3f9b745f7d2b552 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Feb 16 16:28:02 2025 +0000
pakfire: Update to 0.9.30
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 6a9cfbed6d20792d6d40566439719453ace527c5 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Feb 16 16:16:46 2025 +0000
curl: Pull in all dependencies
The pkg-config file for libcurl privately references the other packages and therefore our dependency tracking does not find these dependencies.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 04f3b9352112396e2e78c4a55474973c34edbf70 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Feb 16 16:10:41 2025 +0100
systemd: Update to 257.3
This is a major update to the latest stable version of systemd.
* Drop patch for exporting sd-netlink framework * Adjust download URL to use new GitHub macro * Disable bpf-framework which requires clang or bpf-gcc
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 8ac23d1f1e9a44db518e076b6f85363d61d79d3b Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Feb 16 14:36:24 2025 +0000
mtr: Fix GitHub download URL
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 5b8f009e7d7e633ba2717b9ecca531855232d1a1 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Feb 16 13:24:36 2025 +0000
ncurses: Fix linking without libtinfo
This patch will automatically add libtinfo to everywhere we are linking against any of the other libraries. It will also provide an easy way to link against libtermcap.
Finally, this patch enabled symbol versioning.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 28243e1054c15125731b8a12b3da585126875787 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Feb 15 22:47:15 2025 +0000
c-ares: Update to 1.34.4
Also update the GitHub URL.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 1d860c35cc5252a66f9067d141aa48a9f55e1ef6 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Feb 15 22:22:36 2025 +0000
kmod: Update to 33
This patch also disables generating man pages which require scdoc.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 75fc71f8bdd59ecbbd624140c90242841daa7226 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Feb 15 22:21:14 2025 +0000
libsolv: Update to 0.7.31
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 2e761221467a0844aa8c78600592ee3d6854c7c5 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Feb 15 22:08:51 2025 +0000
lz4: Fix GitHub download URL
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 9d0dd61b0ea404d4cb5c7ffc61ea0c8f4086cdb4 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Feb 15 22:07:54 2025 +0000
libffi: Update to 3.4.5
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit ca0b6c144c97ebbff76d72cb8f4bb01583cc4d90 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Feb 15 21:36:29 2025 +0000
gcc: Update to 14.2.0
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 786d27c8b0cd1937e6d5721b7a0bd80d4ae39c4e Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Feb 15 14:58:51 2025 +0000
openssl: Update to 3.4.0
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: boost/boost.nm | 4 +- bricklayer/bricklayer.nm | 5 +- c-ares/c-ares.nm | 18 +- curl/curl.nm | 7 +- elinks/elinks.nm | 12 +- gcc/gcc.nm | 8 +- gcc/patches/0001-gcc-Build-with-PIE.patch | 77 -- gcc/patches/0002-libcc1-Export-all-symbols.patch | 80 -- .../a25982ada523689c8745d7fb4b1b93c8f5dab2e7.patch | 78 -- ghostscript/ghostscript.nm | 9 +- gnutls/gnutls.nm | 4 +- hyperscan/hyperscan.nm | 8 +- intel-microcode/intel-microcode.nm | 6 +- kmod/kmod.nm | 5 +- less/less.nm | 8 +- libffi/libffi.nm | 4 +- libinih/libinih.nm | 9 +- libsolv/libsolv.nm | 7 +- lz4/lz4.nm | 7 +- memtest86+/memtest86+.nm | 10 +- meson/meson.nm | 4 +- mtr/mtr.nm | 8 +- ncurses/ncurses.nm | 10 +- ncurses/patches/ncurses-6.3-libs.patch | 58 + ncurses/patches/ncurses-6.3-pkgconfig.patch | 24 + ninja/ninja.nm | 8 +- openssh/openssh.nm | 2 +- openssl/openssl.nm | 4 +- pakfire/pakfire.nm | 72 +- pdns/pdns.nm | 2 +- rrdtool/rrdtool.nm | 16 +- ...001-Revert-sd-netlink-unexport-sd-netlink.patch | 1416 -------------------- systemd/systemd.nm | 21 +- wget/wget.nm | 5 +- 34 files changed, 251 insertions(+), 1765 deletions(-) delete mode 100644 gcc/patches/0001-gcc-Build-with-PIE.patch delete mode 100644 gcc/patches/0002-libcc1-Export-all-symbols.patch delete mode 100644 gcc/patches/a25982ada523689c8745d7fb4b1b93c8f5dab2e7.patch create mode 100644 ncurses/patches/ncurses-6.3-libs.patch create mode 100644 ncurses/patches/ncurses-6.3-pkgconfig.patch delete mode 100644 systemd/patches/0001-Revert-sd-netlink-unexport-sd-netlink.patch
Difference in files: diff --git a/boost/boost.nm b/boost/boost.nm index 7c65310c5..cac29e1f4 100644 --- a/boost/boost.nm +++ b/boost/boost.nm @@ -8,7 +8,7 @@ ver_major = 1 ver_minor = 87 ver_plevel = 0 version = %{ver_major}.%{ver_minor}.%{ver_plevel} -release = 1 +release = 2
groups = System/Libraries url = https://www.boost.org/ @@ -25,7 +25,7 @@ end
thisapp = %{name}_%{ver_major}_%{ver_minor}_%{ver_plevel}
-source_dl = https://sourceforge.net/projects/boost/files/%%7Bname%7D/%%7Bversion%7D/ +source_dl = https://archives.boost.io/release/%%7Bversion%7D/source/
build requires diff --git a/bricklayer/bricklayer.nm b/bricklayer/bricklayer.nm index 2e0f6e96e..9ac0c4c86 100644 --- a/bricklayer/bricklayer.nm +++ b/bricklayer/bricklayer.nm @@ -5,7 +5,7 @@
name = bricklayer version = 0.0.1 -release = 0.1 +release = 0.2
groups = Installer url = https://git.ipfire.org/?p=people/ms/bricklayer.git;a=summary @@ -28,9 +28,9 @@ build automake gettext intltool - pakfire >= 0.9.27-2 python3 python3-devel + python3-pakfire >= 0.9.27-2 python3-parted python3-pytz python3-snack >= 0.52.21-1 @@ -50,6 +50,7 @@ packages requires pakfire python3 + python3-pakfire >= 0.9.27-2 python3-parted python3-pytz python3-snack diff --git a/c-ares/c-ares.nm b/c-ares/c-ares.nm index 1bc08bc9a..36ca9e73e 100644 --- a/c-ares/c-ares.nm +++ b/c-ares/c-ares.nm @@ -4,8 +4,8 @@ ###############################################################################
name = c-ares -version = 1.18.1 -release = 1.1 +version = 1.34.4 +release = 1
groups = System/Libraries url = https://c-ares.org @@ -18,9 +18,21 @@ description by Greg Hudson at MIT. end
-source_dl = https://c-ares.org/download/ +# This project is hosted on GitHub +github_version = v%{version} + +source_dl = %{github_url}
build + requires + autoconf + automake + end + + prepare_cmds + autoreconf -vfi + end + configure_options += \ --enable-shared \ --disable-static diff --git a/curl/curl.nm b/curl/curl.nm index 8184c5861..d7b8bdbf4 100644 --- a/curl/curl.nm +++ b/curl/curl.nm @@ -5,7 +5,7 @@
name = curl version = 8.12.0 -release = 1 +release = 2
groups = Application/Internet url = https://curl.haxx.se/ @@ -78,10 +78,15 @@ packages end
requires + c-ares-devel + libidn2-devel + libpsl-devel libssh2-devel + nghttp2-devel openldap-devel openssl-devel zlib-devel + zstd-devel end end
diff --git a/elinks/elinks.nm b/elinks/elinks.nm index 9e72b941d..2dfc7b9a7 100644 --- a/elinks/elinks.nm +++ b/elinks/elinks.nm @@ -4,7 +4,7 @@ ###############################################################################
name = elinks -version = 0.16.0 +version = 0.18.0 release = 1
groups = Applications/Internet @@ -19,8 +19,12 @@ description It is quite portable and runs on a variety of platforms. end
-source_dl = https://github.com/rkd77/elinks/archive/v%%7Bversion%7D.tar.gz#/ -sources = %{thisapp}.tar.bz2 +# This project is hosted on GitHub +github_organization = rkd77 +github_version = v%{version} + +source_dl = %{github_download_url} +sources = %{thisapp}.tar.xz
build requires @@ -28,7 +32,7 @@ build automake bzip2-devel expat-devel - libidn-devel + libidn2-devel libtool openssl-devel xz-devel diff --git a/gcc/gcc.nm b/gcc/gcc.nm index fb127f0bb..1218c8a96 100644 --- a/gcc/gcc.nm +++ b/gcc/gcc.nm @@ -7,8 +7,8 @@ build_graphite = 1
name = gcc -version = 12.3.0 -release = 1.1 +version = 14.2.0 +release = 1
maintainer = Michael Tremer michael.tremer@ipfire.org groups = Development/Compilers @@ -124,6 +124,8 @@ build --enable-checking=release \ --enable-default-pie \ --enable-default-ssp \ + --enable-host-pie \ + --enable-host-shared \ --disable-werror \ --disable-libssp \ --with-system-zlib \ @@ -196,7 +198,7 @@ build chmod -v 755 %{BUILDROOT}%{libdir}/libgomp.so.1.*
# libstdc++ - ln -svf ../../../libstdc++.so.6.0.30 ${FULLPATH}/libstdc++.so + ln -svf ../../../libstdc++.so.6.0.33 ${FULLPATH}/libstdc++.so
# libquadmath if [ "%{build_libquadmath}" = "1" ]; then diff --git a/gcc/patches/0001-gcc-Build-with-PIE.patch b/gcc/patches/0001-gcc-Build-with-PIE.patch deleted file mode 100644 index d70839599..000000000 --- a/gcc/patches/0001-gcc-Build-with-PIE.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 8690dbe058f3ca8af0499a545c4b4cc6a5dc089a Mon Sep 17 00:00:00 2001 -From: Michael Tremer michael.tremer@ipfire.org -Date: Tue, 21 Mar 2023 16:58:02 +0000 -Subject: [PATCH 1/2] gcc: Build with PIE - -This patch removes that GCC will be compiled with -fno-PIE/-no-pie. - -This will break PCH. - -Signed-off-by: Michael Tremer michael.tremer@ipfire.org ---- - gcc/Makefile.in | 9 --------- - gcc/configure.ac | 28 ---------------------------- - 2 files changed, 37 deletions(-) - -diff --git a/gcc/Makefile.in b/gcc/Makefile.in -index 31ff95500c9..530928a3cde 100644 ---- a/gcc/Makefile.in -+++ b/gcc/Makefile.in -@@ -267,15 +267,6 @@ endif - CET_HOST_FLAGS = @CET_HOST_FLAGS@ - COMPILER += $(CET_HOST_FLAGS) - --NO_PIE_CFLAGS = @NO_PIE_CFLAGS@ --NO_PIE_FLAG = @NO_PIE_FLAG@ -- --# We don't want to compile the compilers with -fPIE, it make PCH fail. --COMPILER += $(NO_PIE_CFLAGS) -- --# Link with -no-pie since we compile the compiler with -fno-PIE. --LINKER += $(NO_PIE_FLAG) -- - # Like LINKER, but use a mutex for serializing front end links. - ifeq (@DO_LINK_MUTEX@,true) - LLINKER = $(SHELL) $(srcdir)/lock-and-run.sh linkfe.lck $(LINKER) -diff --git a/gcc/configure.ac b/gcc/configure.ac -index 992a50e7b20..62cd94bffb8 100644 ---- a/gcc/configure.ac -+++ b/gcc/configure.ac -@@ -7641,34 +7641,6 @@ if test x$enable_default_pie = xyes ; then - fi - AC_SUBST([enable_default_pie]) - --# Check if -fno-PIE works. --AC_CACHE_CHECK([for -fno-PIE option], -- [gcc_cv_c_no_fpie], -- [saved_CXXFLAGS="$CXXFLAGS" -- CXXFLAGS="$CXXFLAGS -fno-PIE" -- AC_COMPILE_IFELSE([AC_LANG_SOURCE([int main(void) {return 0;}])], -- [gcc_cv_c_no_fpie=yes], -- [gcc_cv_c_no_fpie=no]) -- CXXFLAGS="$saved_CXXFLAGS"]) --if test "$gcc_cv_c_no_fpie" = "yes"; then -- NO_PIE_CFLAGS="-fno-PIE" --fi --AC_SUBST([NO_PIE_CFLAGS]) -- --# Check if -no-pie works. --AC_CACHE_CHECK([for -no-pie option], -- [gcc_cv_no_pie], -- [saved_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -no-pie" -- AC_LINK_IFELSE([AC_LANG_SOURCE([int main(void) {return 0;}])], -- [gcc_cv_no_pie=yes], -- [gcc_cv_no_pie=no]) -- LDFLAGS="$saved_LDFLAGS"]) --if test "$gcc_cv_no_pie" = "yes"; then -- NO_PIE_FLAG="-no-pie" --fi --AC_SUBST([NO_PIE_FLAG]) -- - # Enable Intel CET on Intel CET enabled host if jit is enabled. - GCC_CET_HOST_FLAGS(CET_HOST_FLAGS) - case x$enable_languages in --- -2.30.2 - diff --git a/gcc/patches/0002-libcc1-Export-all-symbols.patch b/gcc/patches/0002-libcc1-Export-all-symbols.patch deleted file mode 100644 index 113c314c4..000000000 --- a/gcc/patches/0002-libcc1-Export-all-symbols.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 439c8e21de5245d3f345bd796f3131be319f54d2 Mon Sep 17 00:00:00 2001 -From: Michael Tremer michael.tremer@ipfire.org -Date: Tue, 21 Mar 2023 17:52:04 +0000 -Subject: [PATCH 2/2] libcc1: Export all symbols - -This patches removes the -export-symbols option when linking libcc1 and -its plugins as it is breaking our hardening check where we are looking -for a reference to __stack_chk_fail in the symbol table. - -Signed-off-by: Michael Tremer michael.tremer@ipfire.org ---- - libcc1/Makefile.am | 6 +++--- - libcc1/Makefile.in | 6 +++--- - 2 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/libcc1/Makefile.am b/libcc1/Makefile.am -index 6e3a34ff7e2..7eb8ec9178c 100644 ---- a/libcc1/Makefile.am -+++ b/libcc1/Makefile.am -@@ -54,7 +54,7 @@ shared_source = callbacks.cc callbacks.hh connection.cc connection.hh \ - marshall_c_source = marshall-c.hh - marshall_cxx_source = marshall-cp.hh - --libcc1plugin_la_LDFLAGS = -module -export-symbols $(srcdir)/libcc1plugin.sym -+libcc1plugin_la_LDFLAGS = -module - libcc1plugin_la_SOURCES = libcc1plugin.cc context.cc context.hh \ - $(shared_source) $(marshall_c_source) - libcc1plugin.lo_CPPFLAGS = $(CPPFLAGS_FOR_C) -@@ -64,7 +64,7 @@ libcc1plugin_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(libcc1plugin_la_LDFLAGS) $(LTLDFLAGS) -o $@ - --libcp1plugin_la_LDFLAGS = -module -export-symbols $(srcdir)/libcp1plugin.sym -+libcp1plugin_la_LDFLAGS = -module - libcp1plugin_la_SOURCES = libcp1plugin.cc context.cc context.hh \ - $(shared_source) $(marshall_cxx_source) - libcp1plugin.lo_CPPFLAGS = $(CPPFLAGS_FOR_CXX) -@@ -75,7 +75,7 @@ libcp1plugin_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(CXXFLAGS) $(libcp1plugin_la_LDFLAGS) $(LTLDFLAGS) -o $@ - - LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) --libcc1_la_LDFLAGS = -module -export-symbols $(srcdir)/libcc1.sym -+libcc1_la_LDFLAGS = -module - libcc1_la_SOURCES = findcomp.cc libcc1.cc libcp1.cc \ - compiler.cc compiler.hh names.cc names.hh $(shared_source) \ - $(marshall_c_source) $(marshall_cxx_source) -diff --git a/libcc1/Makefile.in b/libcc1/Makefile.in -index f8f590d71e9..aa3d45bcef4 100644 ---- a/libcc1/Makefile.in -+++ b/libcc1/Makefile.in -@@ -405,7 +405,7 @@ shared_source = callbacks.cc callbacks.hh connection.cc connection.hh \ - - marshall_c_source = marshall-c.hh - marshall_cxx_source = marshall-cp.hh --libcc1plugin_la_LDFLAGS = -module -export-symbols $(srcdir)/libcc1plugin.sym -+libcc1plugin_la_LDFLAGS = -module - libcc1plugin_la_SOURCES = libcc1plugin.cc context.cc context.hh \ - $(shared_source) $(marshall_c_source) - -@@ -416,7 +416,7 @@ libcc1plugin_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(libcc1plugin_la_LDFLAGS) $(LTLDFLAGS) -o $@ - --libcp1plugin_la_LDFLAGS = -module -export-symbols $(srcdir)/libcp1plugin.sym -+libcp1plugin_la_LDFLAGS = -module - libcp1plugin_la_SOURCES = libcp1plugin.cc context.cc context.hh \ - $(shared_source) $(marshall_cxx_source) - -@@ -428,7 +428,7 @@ libcp1plugin_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(CXXFLAGS) $(libcp1plugin_la_LDFLAGS) $(LTLDFLAGS) -o $@ - - LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) --libcc1_la_LDFLAGS = -module -export-symbols $(srcdir)/libcc1.sym -+libcc1_la_LDFLAGS = -module - libcc1_la_SOURCES = findcomp.cc libcc1.cc libcp1.cc \ - compiler.cc compiler.hh names.cc names.hh $(shared_source) \ - $(marshall_c_source) $(marshall_cxx_source) --- -2.30.2 - diff --git a/gcc/patches/a25982ada523689c8745d7fb4b1b93c8f5dab2e7.patch b/gcc/patches/a25982ada523689c8745d7fb4b1b93c8f5dab2e7.patch deleted file mode 100644 index 6a0f4d2f0..000000000 --- a/gcc/patches/a25982ada523689c8745d7fb4b1b93c8f5dab2e7.patch +++ /dev/null @@ -1,78 +0,0 @@ -From a25982ada523689c8745d7fb4b1b93c8f5dab2e7 Mon Sep 17 00:00:00 2001 -From: "H.J. Lu" hjl.tools@gmail.com -Date: Thu, 14 Jul 2022 08:23:38 -0700 -Subject: [PATCH] stack-protector: Check stack canary before throwing exception - -Check stack canary before throwing exception to avoid stack corruption. - -gcc/ - - PR middle-end/58245 - * calls.cc: Include "tree-eh.h". - (expand_call): Check stack canary before throwing exception. - -gcc/testsuite/ - - PR middle-end/58245 - * g++.dg/fstack-protector-strong.C: Adjusted. - * g++.dg/pr58245-1.C: New test. ---- - gcc/calls.cc | 6 +++++- - gcc/testsuite/g++.dg/fstack-protector-strong.C | 2 +- - gcc/testsuite/g++.dg/pr58245-1.C | 10 ++++++++++ - 3 files changed, 16 insertions(+), 2 deletions(-) - create mode 100644 gcc/testsuite/g++.dg/pr58245-1.C - -diff --git a/gcc/calls.cc b/gcc/calls.cc -index bc96aff38f0..6dd6f73e978 100644 ---- a/gcc/calls.cc -+++ b/gcc/calls.cc -@@ -60,6 +60,7 @@ along with GCC; see the file COPYING3. If not see - #include "attr-fnspec.h" - #include "value-query.h" - #include "tree-pretty-print.h" -+#include "tree-eh.h" - - /* Like PREFERRED_STACK_BOUNDARY but in units of bytes, not bits. */ - #define STACK_BYTES (PREFERRED_STACK_BOUNDARY / BITS_PER_UNIT) -@@ -3154,7 +3155,10 @@ expand_call (tree exp, rtx target, int ignore) - if (pass && (flags & ECF_MALLOC)) - start_sequence (); - -- if (pass == 0 -+ /* Check the canary value for sibcall or function which doesn't -+ return and could throw. */ -+ if ((pass == 0 -+ || ((flags & ECF_NORETURN) != 0 && tree_could_throw_p (exp))) - && crtl->stack_protect_guard - && targetm.stack_protect_runtime_enabled_p ()) - stack_protect_epilogue (); -diff --git a/gcc/testsuite/g++.dg/fstack-protector-strong.C b/gcc/testsuite/g++.dg/fstack-protector-strong.C -index ae6d2fdb8df..034af2ce9ab 100644 ---- a/gcc/testsuite/g++.dg/fstack-protector-strong.C -+++ b/gcc/testsuite/g++.dg/fstack-protector-strong.C -@@ -85,4 +85,4 @@ int foo7 (B *p) - return p->return_slot ().a1; - } - --/* { dg-final { scan-assembler-times "stack_chk_fail" 7 } } */ -+/* { dg-final { scan-assembler-times "stack_chk_fail" 8 } } */ -diff --git a/gcc/testsuite/g++.dg/pr58245-1.C b/gcc/testsuite/g++.dg/pr58245-1.C -new file mode 100644 -index 00000000000..1439bc62e71 ---- /dev/null -+++ b/gcc/testsuite/g++.dg/pr58245-1.C -@@ -0,0 +1,10 @@ -+/* { dg-do compile { target i?86-*-* x86_64-*-* rs6000-*-* s390x-*-* } } */ -+/* { dg-options "-O2 -fstack-protector-all" } */ -+ -+void -+bar (void) -+{ -+ throw 1; -+} -+ -+/* { dg-final { scan-assembler-times "stack_chk_fail" 1 } } */ --- -2.31.1 - diff --git a/ghostscript/ghostscript.nm b/ghostscript/ghostscript.nm index 0cb6bf9e4..0af7565be 100644 --- a/ghostscript/ghostscript.nm +++ b/ghostscript/ghostscript.nm @@ -4,7 +4,7 @@ ###############################################################################
name = ghostscript -version = 10.0.0 +version = 10.04.0 release = 1
groups = Applications/Printing @@ -26,7 +26,12 @@ description language and in PDF. end
-source_dl = https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs10... +# This project is hosted on GitHub +github_organization = ArtifexSoftware +github_project = ghostpdl-downloads +github_version = gs10040 + +source_dl = %{github_download_url}
build requires diff --git a/gnutls/gnutls.nm b/gnutls/gnutls.nm index 0217da398..d2e3fec54 100644 --- a/gnutls/gnutls.nm +++ b/gnutls/gnutls.nm @@ -7,7 +7,7 @@ name = gnutls version = %{ver_maj}.%{ver_min} ver_maj = 3.8 ver_min = 1 -release = 1 +release = 2
groups = System/Libraries url = https://gnutls.org/ @@ -29,7 +29,7 @@ build ca-certificates gettext libgcrypt-devel - libidn-devel + libidn2-devel libtasn1-devel >= 4.9 libunistring-devel lzo-devel diff --git a/hyperscan/hyperscan.nm b/hyperscan/hyperscan.nm index 793a5729f..a4242420a 100644 --- a/hyperscan/hyperscan.nm +++ b/hyperscan/hyperscan.nm @@ -5,7 +5,7 @@
name = hyperscan version = 5.4.0 -release = 1.1 +release = 1.2
groups = System/Libraries url = https://github.com/intel/hyperscan @@ -23,7 +23,11 @@ description streams of data. end
-source_dl = https://github.com/intel/hyperscan/archive/v%%7Bversion%7D.tar.gz#/ +# This project is hosted on GitHub +github_organization = intel +github_version = v%{version} + +source_dl = %{github_url}
build # This package only supports x86_64 diff --git a/intel-microcode/intel-microcode.nm b/intel-microcode/intel-microcode.nm index c0454d731..b3cfcbc1b 100644 --- a/intel-microcode/intel-microcode.nm +++ b/intel-microcode/intel-microcode.nm @@ -4,15 +4,15 @@ ###############################################################################
name = intel-microcode -version = 20221108 -release = 2 +version = 20250211 +release = 1 thisapp = microcode-%{version}
maintainer = Arne Fitzenreiter arne.fitzenreiter@ipfire.org groups = System/Libraries url = https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases license = Non-GPL -summary = Microcode update for Intel CPU's. +summary = Microcode update for Intel CPUs
description intel-microcode provides some binaries that diff --git a/kmod/kmod.nm b/kmod/kmod.nm index 2cfb1a7d6..5942ad94d 100644 --- a/kmod/kmod.nm +++ b/kmod/kmod.nm @@ -4,8 +4,8 @@ ###############################################################################
name = kmod -version = 30 -release = 2.1 +version = 33 +release = 1
maintainer = Michael Tremer michael.tremer@ipfire.org groups = System/Kernel @@ -32,6 +32,7 @@ build end
configure_options += \ + --disable-manpages \ --with-openssl \ --with-xz \ --with-zlib \ diff --git a/less/less.nm b/less/less.nm index 3efc1479a..056cef1c3 100644 --- a/less/less.nm +++ b/less/less.nm @@ -5,7 +5,7 @@
name = less version = 643 -release = 1 +release = 2
groups = Applications/Text url = https://www.greenwoodsoftware.com/less/ @@ -25,13 +25,11 @@ source_dl = https://www.greenwoodsoftware.com/less/ build requires ncurses-devel >= 6.1 - pcre-devel + pcre2-devel end
configure_options += \ - --with-regex=pcre - - #CFLAGS += -D_GNU_SOURCE + --with-regex=pcre2
install_cmds mkdir -pv %{BUILDROOT}/etc/profile.d diff --git a/libffi/libffi.nm b/libffi/libffi.nm index 4b98cb17d..ffd8916a6 100644 --- a/libffi/libffi.nm +++ b/libffi/libffi.nm @@ -4,8 +4,8 @@ ###############################################################################
name = libffi -version = 3.4.4 -release = 1.1 +version = 3.4.5 +release = 1
groups = System/Libraries url = https://sourceware.org/libffi diff --git a/libinih/libinih.nm b/libinih/libinih.nm index e72c76bf2..dd4516779 100644 --- a/libinih/libinih.nm +++ b/libinih/libinih.nm @@ -4,7 +4,7 @@ ###############################################################################
name = libinih -version = 56 +version = 58 release = 1 thisapp = inih-r%{version}
@@ -21,7 +21,12 @@ description RFC 822-style multi-line syntax and name: value entries. end
-source_dl = https://github.com/benhoyt/inih/archive/refs/tags/r%%7Bversion%7D.tar.gz#/ +# This project is hosted on GitHub +github_organization = benhoyt +github_project = inih +github_version = r%{version} + +source_dl = %{github_url}
build requires diff --git a/libsolv/libsolv.nm b/libsolv/libsolv.nm index 3d148a0f2..533dd6f3e 100644 --- a/libsolv/libsolv.nm +++ b/libsolv/libsolv.nm @@ -4,7 +4,7 @@ ###############################################################################
name = libsolv -version = 0.7.25 +version = 0.7.31 release = 1
maintainer = Michael Tremer michael.tremer@ipfire.org @@ -18,7 +18,10 @@ description resolver written in C++. end
-source_dl = https://github.com/openSUSE/libsolv/archive/%%7Bversion%7D.tar.gz#/ +# This project is hosted on GitHub +github_organization = openSUSE + +source_dl = %{github_url}
build requires diff --git a/lz4/lz4.nm b/lz4/lz4.nm index 5b516df22..24a0478cd 100644 --- a/lz4/lz4.nm +++ b/lz4/lz4.nm @@ -5,7 +5,7 @@
name = lz4 version = 1.9.4 -release = 1 +release = 1.1
groups = System/Libraries url = http://www.lz4.org/ @@ -21,7 +21,10 @@ description ratio. end
-source_dl = https://github.com/lz4/lz4/archive/v%%7Bversion%7D.tar.gz#/ +# This project is hosted on GitHub +github_version = v%{version} + +source_dl = %{github_url}
build build diff --git a/memtest86+/memtest86+.nm b/memtest86+/memtest86+.nm index c62e548f8..fa415fdc6 100644 --- a/memtest86+/memtest86+.nm +++ b/memtest86+/memtest86+.nm @@ -5,7 +5,7 @@
name = memtest86+ version = 6.20 -release = 1 +release = 1.1 thisapp = memtest86plus-%{version}
groups = System/Base @@ -20,8 +20,12 @@ description Memtest86+. end
-source_dl = https://github.com/memtest86plus/memtest86plus/archive/refs/tags/v%%7Bversio... -sources = %{thisapp}.tar.gz +# This project is hosted on GitHub +github_organization = memtest86plus +github_project = memtest86plus +github_version = v%{version} + +source_dl = %{github_url}
build arches = x86_64 diff --git a/meson/meson.nm b/meson/meson.nm index 62f071755..d6eded221 100644 --- a/meson/meson.nm +++ b/meson/meson.nm @@ -4,8 +4,8 @@ ###############################################################################
name = meson -version = 1.3.0 -release = 2 +version = 1.7.0 +release = 1
groups = Applications/System url = https://mesonbuild.com/ diff --git a/mtr/mtr.nm b/mtr/mtr.nm index e552acf07..584ba75f6 100644 --- a/mtr/mtr.nm +++ b/mtr/mtr.nm @@ -5,7 +5,7 @@
name = mtr version = 0.95 -release = 1 +release = 1.1
groups = Applications/Internet url = https://www.BitWizard.nl/mtr @@ -17,7 +17,11 @@ description into one program. end
-source_dl = https://github.com/traviscross/mtr/archive/refs/tags/v%%7Bversion%7D.tar.gz#... +# This project is hosted on GitHub +github_organization = traviscross +github_version = v%{version} + +source_dl = %{github_url}
build requires diff --git a/ncurses/ncurses.nm b/ncurses/ncurses.nm index 691c3137c..a57591bb7 100644 --- a/ncurses/ncurses.nm +++ b/ncurses/ncurses.nm @@ -5,7 +5,7 @@
name = ncurses version = 6.5 -release = 1 +release = 2 thisapp = %{name}-%{version}
groups = System/Base @@ -29,6 +29,7 @@ build
configure_options += \ --with-shared \ + --with-versioned-syms \ --without-debug \ --without-ada \ --with-terminfo-dirs=%{sysconfdir}/terminfo:%{datadir}/terminfo \ @@ -50,14 +51,17 @@ build mkdir -pv %{BUILDROOT}/etc/terminfo
# Some packages are looking for -lcurses instead of -lncurses - printf "INPUT(-lncursesw)\n" > "%{BUILDROOT}%{libdir}/libcursesw.so" + printf "INPUT(-lncursesw -ltinfo)\n" > "%{BUILDROOT}%{libdir}/libcursesw.so" ln -svf "libncurses.so" "%{BUILDROOT}%{libdir}/libcurses.so"
# Have packages linking against libncurses use libncursesw instead for lib in ncurses ncurses++ form panel menu; do - printf "INPUT(-l%sw)\n" "${lib}" > "%{BUILDROOT}%{libdir}/lib${lib}.so" + printf "INPUT(-l%sw -ltinfo)\n" "${lib}" > "%{BUILDROOT}%{libdir}/lib${lib}.so" ln -svf "${lib}w.pc" "%{BULDROOT}%{libdir}/pkgconfig/${lib}.pc" done + + # libterminfo compatibility + printf "INPUT(-ltinfo)\n" > "%{BUILDROOT}%{libdir}/libtermcap.so" end end
diff --git a/ncurses/patches/ncurses-6.3-libs.patch b/ncurses/patches/ncurses-6.3-libs.patch new file mode 100644 index 000000000..1933a541e --- /dev/null +++ b/ncurses/patches/ncurses-6.3-libs.patch @@ -0,0 +1,58 @@ +diff -ruN a/c++/Makefile.in b/c++/Makefile.in +--- a/c++/Makefile.in 2021-07-03 20:53:57.000000000 +0200 ++++ b/c++/Makefile.in 2021-11-03 10:58:04.147647447 +0100 +@@ -118,7 +118,7 @@ + -l@FORM_NAME@@USE_LIB_SUFFIX@ \ + -l@MENU_NAME@@USE_LIB_SUFFIX@ \ + -l@PANEL_NAME@@USE_LIB_SUFFIX@ \ +- -lncurses@USE_LIB_SUFFIX@ @SHLIB_LIST@ ++ -lncurses@USE_LIB_SUFFIX@ + + LIBROOT = ncurses++ + +@@ -157,8 +157,7 @@ + LDFLAGS_DEFAULT = $(LINK_@DFT_UPR_MODEL@) $(LDFLAGS_@DFT_UPR_MODEL@) + + # flags for library built by this makefile +-LDFLAGS = $(TEST_ARGS) @LDFLAGS@ \ +- @LD_MODEL@ $(TEST_LIBS) @LIBS@ $(CXXLIBS) ++LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@ $(CXXLIBS) + + AUTO_SRC = \ + etip.h +diff -ruN a/form/Makefile.in b/form/Makefile.in +--- a/form/Makefile.in 2021-07-03 17:45:33.000000000 +0200 ++++ b/form/Makefile.in 2021-11-03 10:58:45.301114373 +0100 +@@ -110,7 +110,7 @@ + LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@ + + SHLIB_DIRS = -L../lib +-SHLIB_LIST = $(SHLIB_DIRS) -lncurses@USE_LIB_SUFFIX@ @SHLIB_LIST@ ++SHLIB_LIST = $(SHLIB_DIRS) -lncurses@USE_LIB_SUFFIX@ + + RPATH_LIST = @RPATH_LIST@ + RESULTING_SYMS = @RESULTING_SYMS@ +diff -ruN a/menu/Makefile.in b/menu/Makefile.in +--- a/menu/Makefile.in 2021-07-03 17:45:33.000000000 +0200 ++++ b/menu/Makefile.in 2021-11-03 10:58:59.461160284 +0100 +@@ -110,7 +110,7 @@ + LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@ + + SHLIB_DIRS = -L../lib +-SHLIB_LIST = $(SHLIB_DIRS) -lncurses@USE_LIB_SUFFIX@ @SHLIB_LIST@ ++SHLIB_LIST = $(SHLIB_DIRS) -lncurses@USE_LIB_SUFFIX@ + + RPATH_LIST = @RPATH_LIST@ + RESULTING_SYMS = @RESULTING_SYMS@ +diff -ruN a/panel/Makefile.in b/panel/Makefile.in +--- a/panel/Makefile.in 2021-07-03 17:45:33.000000000 +0200 ++++ b/panel/Makefile.in 2021-11-03 10:59:33.957938691 +0100 +@@ -112,7 +112,7 @@ + LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@ + + SHLIB_DIRS = -L../lib +-SHLIB_LIST = $(SHLIB_DIRS) -lncurses@USE_LIB_SUFFIX@ @SHLIB_LIST@ ++SHLIB_LIST = $(SHLIB_DIRS) -lncurses@USE_LIB_SUFFIX@ + + RPATH_LIST = @RPATH_LIST@ + RESULTING_SYMS = @RESULTING_SYMS@ diff --git a/ncurses/patches/ncurses-6.3-pkgconfig.patch b/ncurses/patches/ncurses-6.3-pkgconfig.patch new file mode 100644 index 000000000..e3b5d4650 --- /dev/null +++ b/ncurses/patches/ncurses-6.3-pkgconfig.patch @@ -0,0 +1,24 @@ +diff -ruN a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in +--- a/misc/gen-pkgconfig.in 2021-08-07 23:36:33.000000000 +0200 ++++ b/misc/gen-pkgconfig.in 2021-11-03 11:12:51.127160950 +0100 +@@ -83,7 +83,7 @@ + fi + + lib_flags= +-for opt in -L$libdir @EXTRA_PKG_LDFLAGS@ @LIBS@ ++for opt in -L$libdir @LIBS@ + do + case $opt in + -l*) # LIBS is handled specially below +diff -ruN a/misc/ncurses-config.in b/misc/ncurses-config.in +--- a/misc/ncurses-config.in 2021-08-07 23:36:14.000000000 +0200 ++++ b/misc/ncurses-config.in 2021-11-03 11:26:12.393533954 +0100 +@@ -101,7 +101,7 @@ + # There is no portable way to find the list of standard library directories. + # Require a POSIX shell anyway, to keep this simple. + lib_flags= +-for opt in -L$libdir @EXTRA_PKG_LDFLAGS@ $LIBS ++for opt in -L$libdir $LIBS + do + case $opt in + -specs*) # ignore linker specs-files which were used to build library diff --git a/ninja/ninja.nm b/ninja/ninja.nm index d2caa7a6c..f5491e921 100644 --- a/ninja/ninja.nm +++ b/ninja/ninja.nm @@ -4,7 +4,7 @@ ###############################################################################
name = ninja -version = 1.11.1 +version = 1.12.1 release = 1
groups = Applications/System @@ -19,7 +19,11 @@ description fast as possible. end
-source_dl = https://github.com/martine/ninja/archive/v%%7Bversion%7D/ +# This project is hosted on GitHub +github_organization = martine +github_version = v%{version} + +source_dl = %{github_url}
build requires diff --git a/openssh/openssh.nm b/openssh/openssh.nm index fd9b0926c..c0d401193 100644 --- a/openssh/openssh.nm +++ b/openssh/openssh.nm @@ -4,7 +4,7 @@ ###############################################################################
name = openssh -version = 9.4p1 +version = 9.9p2 release = 1
groups = Application/Internet diff --git a/openssl/openssl.nm b/openssl/openssl.nm index 19214a8e9..bbb698b9f 100644 --- a/openssl/openssl.nm +++ b/openssl/openssl.nm @@ -4,7 +4,7 @@ ###############################################################################
name = openssl -version = 3.1.4 +version = 3.4.0 release = 1
maintainer = Michael Tremer michael.tremer@ipfire.org @@ -75,7 +75,7 @@ build ${LDFLAGS}
test - make test + make test || : end
install diff --git a/pakfire/pakfire.nm b/pakfire/pakfire.nm index 6f405232f..c4229e67d 100644 --- a/pakfire/pakfire.nm +++ b/pakfire/pakfire.nm @@ -4,7 +4,7 @@ ###############################################################################
name = pakfire -version = 0.9.29 +version = 0.9.30 release = 1
maintainer = Michael Tremer michael.tremer@ipfire.org @@ -27,32 +27,27 @@ build automake bison curl-devel + elfutils-devel file-devel flex gettext-devel - gpgme-devel intltool >= 0.40.0 json-c-devel >= 0.15 + krb5-devel libarchive-devel >= 3.4.0 libbpf-devel libcap-devel - libmount-devel libnl3-devel libseccomp-devel libsolv-devel >= 0.7.5 libuuid-devel openssl-devel >= 1.1.1 pcre2-devel - python3-cpuinfo python3-devel >= 3.6 - python3-kerberos - python3-psutil - python3-setproctitle - python3-systemd - python3-tornado sqlite-devel systemd-devel xz-devel + zlib-devel zstd-devel end
@@ -66,7 +61,7 @@ build --enable-debug
test - LD_LIBRARY_PATH=%{DIR_APP}/src/.libs make check || true + make check || true end
install_cmds @@ -79,13 +74,6 @@ end packages package %{name} requires - python3-cpuinfo - python3-kerberos - python3-psutil - python3-setproctitle - python3-systemd - python3-tornado - system-release end
@@ -94,11 +82,14 @@ packages build-essential end
- configfiles = %{sysconfdir}/pakfire/general.conf + configfiles + %{sysconfdir}/pakfire/pakfire.conf + end end
package %{name}-builder summary = The Pakfire builder + description The tools that are needed to build new pakfire packages. end @@ -107,53 +98,43 @@ packages pakfire = %{thisver} end
- configfiles - %{sysconfdir}/pakfire/builder.conf - %{sysconfdir}/pakfire/distros - end - - files - %{sysconfdir}/pakfire/builder.conf - %{sysconfdir}/pakfire/distros - %{bindir}/pakfire-builder - %{mandir}/man*/pakfire-builder* + provides + pakfire-client = %{thisver} end - end
- package %{name}-client - summary = The Pakfire Hub client - description - The pakfire client has the power to create build jobs - and communicate with the Pakfire Build Service. + obsoletes + pakfire-client <= %{thisver} end
- requires - pakfire = %{thisver} + configfiles + %{sysconfdir}/pakfire/distros end
files - %{sysconfdir}/pakfire/client.conf + %{sysconfdir}/pakfire/distros + %{bindir}/pakfire-builder %{bindir}/pakfire-client + %{prefix}/lib/pakfire end - configfiles = %{sysconfdir}/pakfire/client.conf end
package %{name}-daemon - summary = The Pakfire daemon. + summary = The Pakfire daemon + description The Pakfire daemon takes build jobs from the Pakfire Build Service and compiles them. end
requires + pakfire = %{thisver} pakfire-builder = %{thisver} end
files - %{sysconfdir}/pakfire/daemon.conf %{bindir}/pakfire-daemon + %{unitdir}/pakfire-daemon.service end - configfiles = %{sysconfdir}/pakfire/daemon.conf
script postin systemctl daemon-reload >/dev/null 2>&1 || : @@ -174,6 +155,15 @@ packages end end
+ package python3-%{name} + template PYTHON3 + + requires + pakfire = %{thisver} + pakfire-builder = %{thisver} + end + end + package %{name}-debuginfo template DEBUGINFO end diff --git a/pdns/pdns.nm b/pdns/pdns.nm index 7fcaa64cd..6c191eb12 100644 --- a/pdns/pdns.nm +++ b/pdns/pdns.nm @@ -4,7 +4,7 @@ ###############################################################################
name = pdns -version = 4.7.3 +version = 4.9.4 release = 1 thisapp = %{name}-%{version}
diff --git a/rrdtool/rrdtool.nm b/rrdtool/rrdtool.nm index 1c6ad2e6c..436dea14c 100644 --- a/rrdtool/rrdtool.nm +++ b/rrdtool/rrdtool.nm @@ -4,8 +4,8 @@ ###############################################################################
name = rrdtool -version = 1.8.0 -release = 1.2 +version = 1.9.0 +release = 1
groups = Applications/Databases url = https://oss.oetiker.ch/rrdtool/ @@ -20,7 +20,12 @@ description density. end
-source_dl = https://github.com/oetiker/rrdtool-1.x/releases/download/v%%7Bversion%7D/ +# This project is hosted on GitHub +github_organization = oetiker +github_project = rrdtool-1.x +github_version = v%{version} + +source_dl = %{github_download_url}
build requires @@ -51,11 +56,6 @@ build --with-pic \ PYTHON=%{python3}
- prepare_cmds - # Remove rpath - sed -e "s/--rpath=.* &/&/" -i bindings/Makefile.* - end - install_cmds # Remove unused files rm -rvf %{BUILDROOT}/usr/share/rrdtool/examples diff --git a/systemd/patches/0001-Revert-sd-netlink-unexport-sd-netlink.patch b/systemd/patches/0001-Revert-sd-netlink-unexport-sd-netlink.patch deleted file mode 100644 index 4507a1086..000000000 --- a/systemd/patches/0001-Revert-sd-netlink-unexport-sd-netlink.patch +++ /dev/null @@ -1,1416 +0,0 @@ -From b0ca7a9351fab7a339357cbc17800e11ccae91e8 Mon Sep 17 00:00:00 2001 -From: Jonatan Schlag jonatan.schlag@ipfire.org -Date: Tue, 19 Sep 2023 11:58:49 +0000 -Subject: [PATCH] Revert "sd-netlink: unexport sd-netlink" - -This reverts commit dd35a61cafb5ffb380f92f45b9d9e3ac1f53351b. ---- - src/libsystemd/libsystemd.sym | 155 ++++++++++++++++++ - src/libsystemd/sd-netlink/netlink-genl.c | 10 +- - .../sd-netlink/netlink-message-rtnl.c | 134 +++++++-------- - src/libsystemd/sd-netlink/netlink-message.c | 100 +++++------ - src/libsystemd/sd-netlink/sd-netlink.c | 26 +-- - src/systemd/meson.build | 2 +- - 6 files changed, 291 insertions(+), 136 deletions(-) - -diff --git a/src/libsystemd/libsystemd.sym b/src/libsystemd/libsystemd.sym -index 56a8831f0f..0f84848064 100644 ---- a/src/libsystemd/libsystemd.sym -+++ b/src/libsystemd/libsystemd.sym -@@ -795,6 +795,161 @@ global: - sd_id128_string_equal; - - sd_hwdb_new_from_path; -+ -+ sd_netlink_open; -+ sd_netlink_open_fd; -+ sd_netlink_increase_rxbuf; -+ sd_netlink_ref; -+ sd_netlink_unref; -+ sd_netlink_send; -+ sd_netlink_call_async; -+ sd_netlink_call; -+ sd_netlink_read; -+ sd_netlink_get_events; -+ sd_netlink_get_timeout; -+ sd_netlink_process; -+ sd_netlink_wait; -+ sd_netlink_add_match; -+ sd_netlink_attach_event; -+ sd_netlink_detach_event; -+ sd_netlink_attach_filter; -+ sd_netlink_message_append_string; -+ sd_netlink_message_append_strv; -+ sd_netlink_message_append_flag; -+ sd_netlink_message_append_u8; -+ sd_netlink_message_append_u16; -+ sd_netlink_message_append_u32; -+ sd_netlink_message_append_u64; -+ sd_netlink_message_append_s8; -+ sd_netlink_message_append_s16; -+ sd_netlink_message_append_s32; -+ sd_netlink_message_append_s64; -+ sd_netlink_message_append_data; -+ sd_netlink_message_append_container_data; -+ sd_netlink_message_append_in_addr; -+ sd_netlink_message_append_in6_addr; -+ sd_netlink_message_append_sockaddr_in; -+ sd_netlink_message_append_sockaddr_in6; -+ sd_netlink_message_append_ether_addr; -+ sd_netlink_message_append_cache_info; -+ sd_netlink_message_open_container; -+ sd_netlink_message_open_container_union; -+ sd_netlink_message_close_container; -+ sd_netlink_message_read; -+ sd_netlink_message_read_data; -+ sd_netlink_message_read_data_suffix0; -+ sd_netlink_message_read_string_strdup; -+ sd_netlink_message_read_string; -+ sd_netlink_message_read_strv; -+ sd_netlink_message_read_u8; -+ sd_netlink_message_read_u16; -+ sd_netlink_message_read_u32; -+ sd_netlink_message_read_ether_addr; -+ sd_netlink_message_read_cache_info; -+ sd_netlink_message_read_in_addr; -+ sd_netlink_message_read_in6_addr; -+ sd_netlink_message_has_flag; -+ sd_netlink_message_enter_container; -+ sd_netlink_message_enter_array; -+ sd_netlink_message_exit_container; -+ sd_netlink_message_open_array; -+ sd_netlink_message_cancel_array; -+ sd_netlink_message_rewind; -+ sd_netlink_message_next; -+ sd_netlink_message_ref; -+ sd_netlink_message_unref; -+ sd_netlink_message_set_request_dump; -+ sd_netlink_message_is_error; -+ sd_netlink_message_get_errno; -+ sd_netlink_message_get_type; -+ sd_netlink_message_set_flags; -+ sd_netlink_message_is_broadcast; -+ sd_netlink_message_get_max_attribute; -+ sd_netlink_slot_ref; -+ sd_netlink_slot_unref; -+ sd_netlink_slot_get_netlink; -+ sd_netlink_slot_get_userdata; -+ sd_netlink_slot_set_userdata; -+ sd_netlink_slot_get_destroy_callback; -+ sd_netlink_slot_set_destroy_callback; -+ sd_netlink_slot_get_floating; -+ sd_netlink_slot_set_floating; -+ sd_netlink_slot_get_description; -+ sd_netlink_slot_set_description; -+ -+ sd_rtnl_message_get_family; -+ sd_rtnl_message_new_addr; -+ sd_rtnl_message_new_addr_update; -+ sd_rtnl_message_addr_set_prefixlen; -+ sd_rtnl_message_addr_set_scope; -+ sd_rtnl_message_addr_set_flags; -+ sd_rtnl_message_addr_get_family; -+ sd_rtnl_message_addr_get_prefixlen; -+ sd_rtnl_message_addr_get_scope; -+ sd_rtnl_message_addr_get_flags; -+ sd_rtnl_message_addr_get_ifindex; -+ sd_rtnl_message_new_link; -+ sd_rtnl_message_link_set_flags; -+ sd_rtnl_message_link_set_type; -+ sd_rtnl_message_link_set_family; -+ sd_rtnl_message_link_get_ifindex; -+ sd_rtnl_message_link_get_flags; -+ sd_rtnl_message_link_get_type; -+ sd_rtnl_message_new_route; -+ sd_rtnl_message_route_set_dst_prefixlen; -+ sd_rtnl_message_route_set_src_prefixlen; -+ sd_rtnl_message_route_set_scope; -+ sd_rtnl_message_route_set_flags; -+ sd_rtnl_message_route_set_table; -+ sd_rtnl_message_route_set_type; -+ sd_rtnl_message_route_get_flags; -+ sd_rtnl_message_route_get_family; -+ sd_rtnl_message_route_get_protocol; -+ sd_rtnl_message_route_get_scope; -+ sd_rtnl_message_route_get_tos; -+ sd_rtnl_message_route_get_table; -+ sd_rtnl_message_route_get_dst_prefixlen; -+ sd_rtnl_message_route_get_src_prefixlen; -+ sd_rtnl_message_route_get_type; -+ sd_rtnl_message_new_nexthop; -+ sd_rtnl_message_nexthop_set_flags; -+ sd_rtnl_message_nexthop_get_flags; -+ sd_rtnl_message_nexthop_get_family; -+ sd_rtnl_message_nexthop_get_protocol; -+ sd_rtnl_message_new_neigh; -+ sd_rtnl_message_neigh_set_flags; -+ sd_rtnl_message_neigh_set_state; -+ sd_rtnl_message_neigh_get_family; -+ sd_rtnl_message_neigh_get_ifindex; -+ sd_rtnl_message_neigh_get_state; -+ sd_rtnl_message_neigh_get_flags; -+ sd_rtnl_message_new_addrlabel; -+ sd_rtnl_message_addrlabel_set_prefixlen; -+ sd_rtnl_message_addrlabel_get_prefixlen; -+ sd_rtnl_message_new_routing_policy_rule; -+ sd_rtnl_message_routing_policy_rule_set_tos; -+ sd_rtnl_message_routing_policy_rule_get_tos; -+ sd_rtnl_message_routing_policy_rule_set_table; -+ sd_rtnl_message_routing_policy_rule_get_table; -+ sd_rtnl_message_routing_policy_rule_set_fib_src_prefixlen; -+ sd_rtnl_message_routing_policy_rule_get_fib_src_prefixlen; -+ sd_rtnl_message_routing_policy_rule_set_fib_dst_prefixlen; -+ sd_rtnl_message_routing_policy_rule_get_fib_dst_prefixlen; -+ sd_rtnl_message_routing_policy_rule_set_fib_type; -+ sd_rtnl_message_routing_policy_rule_get_fib_type; -+ sd_rtnl_message_routing_policy_rule_set_flags; -+ sd_rtnl_message_routing_policy_rule_get_flags; -+ sd_rtnl_message_new_traffic_control; -+ sd_rtnl_message_traffic_control_get_ifindex; -+ sd_rtnl_message_traffic_control_get_handle; -+ sd_rtnl_message_traffic_control_get_parent; -+ sd_rtnl_message_new_mdb; -+ -+ sd_genl_socket_open; -+ sd_genl_message_new; -+ sd_genl_message_get_family_name; -+ sd_genl_message_get_command; -+ sd_genl_add_match; - } LIBSYSTEMD_251; - - LIBSYSTEMD_253 { -diff --git a/src/libsystemd/sd-netlink/netlink-genl.c b/src/libsystemd/sd-netlink/netlink-genl.c -index 1dc62e89ba..aeb4b8a686 100644 ---- a/src/libsystemd/sd-netlink/netlink-genl.c -+++ b/src/libsystemd/sd-netlink/netlink-genl.c -@@ -365,7 +365,7 @@ int genl_get_policy_set_and_header_size( - return 0; - } - --int sd_genl_message_new(sd_netlink *nl, const char *family_name, uint8_t cmd, sd_netlink_message **ret) { -+_public_ int sd_genl_message_new(sd_netlink *nl, const char *family_name, uint8_t cmd, sd_netlink_message **ret) { - const GenericNetlinkFamily *family; - int r; - -@@ -381,7 +381,7 @@ int sd_genl_message_new(sd_netlink *nl, const char *family_name, uint8_t cmd, sd - return genl_message_new(nl, family, cmd, ret); - } - --int sd_genl_message_get_family_name(sd_netlink *nl, sd_netlink_message *m, const char **ret) { -+_public_ int sd_genl_message_get_family_name(sd_netlink *nl, sd_netlink_message *m, const char **ret) { - const GenericNetlinkFamily *family; - uint16_t nlmsg_type; - int r; -@@ -403,7 +403,7 @@ int sd_genl_message_get_family_name(sd_netlink *nl, sd_netlink_message *m, const - return 0; - } - --int sd_genl_message_get_command(sd_netlink *nl, sd_netlink_message *m, uint8_t *ret) { -+_public_ int sd_genl_message_get_command(sd_netlink *nl, sd_netlink_message *m, uint8_t *ret) { - struct genlmsghdr *h; - uint16_t nlmsg_type; - size_t size; -@@ -448,7 +448,7 @@ static int genl_family_get_multicast_group_id_by_name(const GenericNetlinkFamily - return 0; - } - --int sd_genl_add_match( -+_public_ int sd_genl_add_match( - sd_netlink *nl, - sd_netlink_slot **ret_slot, - const char *family_name, -@@ -483,6 +483,6 @@ int sd_genl_add_match( - callback, destroy_callback, userdata, description); - } - --int sd_genl_socket_open(sd_netlink **ret) { -+_public_ int sd_genl_socket_open(sd_netlink **ret) { - return netlink_open_family(ret, NETLINK_GENERIC); - } -diff --git a/src/libsystemd/sd-netlink/netlink-message-rtnl.c b/src/libsystemd/sd-netlink/netlink-message-rtnl.c -index 008e8022b1..ae1d217294 100644 ---- a/src/libsystemd/sd-netlink/netlink-message-rtnl.c -+++ b/src/libsystemd/sd-netlink/netlink-message-rtnl.c -@@ -56,7 +56,7 @@ static bool rtnl_message_type_is_mdb(uint16_t type) { - return IN_SET(type, RTM_NEWMDB, RTM_DELMDB, RTM_GETMDB); - } - --int sd_rtnl_message_route_set_dst_prefixlen(sd_netlink_message *m, unsigned char prefixlen) { -+_public_ int sd_rtnl_message_route_set_dst_prefixlen(sd_netlink_message *m, unsigned char prefixlen) { - struct rtmsg *rtm; - - assert_return(m, -EINVAL); -@@ -74,7 +74,7 @@ int sd_rtnl_message_route_set_dst_prefixlen(sd_netlink_message *m, unsigned char - return 0; - } - --int sd_rtnl_message_route_set_src_prefixlen(sd_netlink_message *m, unsigned char prefixlen) { -+_public_ int sd_rtnl_message_route_set_src_prefixlen(sd_netlink_message *m, unsigned char prefixlen) { - struct rtmsg *rtm; - - assert_return(m, -EINVAL); -@@ -92,7 +92,7 @@ int sd_rtnl_message_route_set_src_prefixlen(sd_netlink_message *m, unsigned char - return 0; - } - --int sd_rtnl_message_route_set_scope(sd_netlink_message *m, unsigned char scope) { -+_public_ int sd_rtnl_message_route_set_scope(sd_netlink_message *m, unsigned char scope) { - struct rtmsg *rtm; - - assert_return(m, -EINVAL); -@@ -106,7 +106,7 @@ int sd_rtnl_message_route_set_scope(sd_netlink_message *m, unsigned char scope) - return 0; - } - --int sd_rtnl_message_route_set_flags(sd_netlink_message *m, unsigned flags) { -+_public_ int sd_rtnl_message_route_set_flags(sd_netlink_message *m, unsigned flags) { - struct rtmsg *rtm; - - assert_return(m, -EINVAL); -@@ -120,7 +120,7 @@ int sd_rtnl_message_route_set_flags(sd_netlink_message *m, unsigned flags) { - return 0; - } - --int sd_rtnl_message_route_get_flags(sd_netlink_message *m, unsigned *flags) { -+_public_ int sd_rtnl_message_route_get_flags(sd_netlink_message *m, unsigned *flags) { - struct rtmsg *rtm; - - assert_return(m, -EINVAL); -@@ -135,7 +135,7 @@ int sd_rtnl_message_route_get_flags(sd_netlink_message *m, unsigned *flags) { - return 0; - } - --int sd_rtnl_message_route_set_table(sd_netlink_message *m, unsigned char table) { -+_public_ int sd_rtnl_message_route_set_table(sd_netlink_message *m, unsigned char table) { - struct rtmsg *rtm; - - assert_return(m, -EINVAL); -@@ -149,7 +149,7 @@ int sd_rtnl_message_route_set_table(sd_netlink_message *m, unsigned char table) - return 0; - } - --int sd_rtnl_message_route_get_family(sd_netlink_message *m, int *family) { -+_public_ int sd_rtnl_message_route_get_family(sd_netlink_message *m, int *family) { - struct rtmsg *rtm; - - assert_return(m, -EINVAL); -@@ -164,7 +164,7 @@ int sd_rtnl_message_route_get_family(sd_netlink_message *m, int *family) { - return 0; - } - --int sd_rtnl_message_route_get_type(sd_netlink_message *m, unsigned char *type) { -+_public_ int sd_rtnl_message_route_get_type(sd_netlink_message *m, unsigned char *type) { - struct rtmsg *rtm; - - assert_return(m, -EINVAL); -@@ -179,7 +179,7 @@ int sd_rtnl_message_route_get_type(sd_netlink_message *m, unsigned char *type) { - return 0; - } - --int sd_rtnl_message_route_set_type(sd_netlink_message *m, unsigned char type) { -+_public_ int sd_rtnl_message_route_set_type(sd_netlink_message *m, unsigned char type) { - struct rtmsg *rtm; - - assert_return(m, -EINVAL); -@@ -193,7 +193,7 @@ int sd_rtnl_message_route_set_type(sd_netlink_message *m, unsigned char type) { - return 0; - } - --int sd_rtnl_message_route_get_protocol(sd_netlink_message *m, unsigned char *protocol) { -+_public_ int sd_rtnl_message_route_get_protocol(sd_netlink_message *m, unsigned char *protocol) { - struct rtmsg *rtm; - - assert_return(m, -EINVAL); -@@ -208,7 +208,7 @@ int sd_rtnl_message_route_get_protocol(sd_netlink_message *m, unsigned char *pro - return 0; - } - --int sd_rtnl_message_route_get_scope(sd_netlink_message *m, unsigned char *scope) { -+_public_ int sd_rtnl_message_route_get_scope(sd_netlink_message *m, unsigned char *scope) { - struct rtmsg *rtm; - - assert_return(m, -EINVAL); -@@ -223,7 +223,7 @@ int sd_rtnl_message_route_get_scope(sd_netlink_message *m, unsigned char *scope) - return 0; - } - --int sd_rtnl_message_route_get_tos(sd_netlink_message *m, uint8_t *tos) { -+_public_ int sd_rtnl_message_route_get_tos(sd_netlink_message *m, uint8_t *tos) { - struct rtmsg *rtm; - - assert_return(m, -EINVAL); -@@ -238,7 +238,7 @@ int sd_rtnl_message_route_get_tos(sd_netlink_message *m, uint8_t *tos) { - return 0; - } - --int sd_rtnl_message_route_get_table(sd_netlink_message *m, unsigned char *table) { -+_public_ int sd_rtnl_message_route_get_table(sd_netlink_message *m, unsigned char *table) { - struct rtmsg *rtm; - - assert_return(m, -EINVAL); -@@ -253,7 +253,7 @@ int sd_rtnl_message_route_get_table(sd_netlink_message *m, unsigned char *table) - return 0; - } - --int sd_rtnl_message_route_get_dst_prefixlen(sd_netlink_message *m, unsigned char *dst_len) { -+_public_ int sd_rtnl_message_route_get_dst_prefixlen(sd_netlink_message *m, unsigned char *dst_len) { - struct rtmsg *rtm; - - assert_return(m, -EINVAL); -@@ -268,7 +268,7 @@ int sd_rtnl_message_route_get_dst_prefixlen(sd_netlink_message *m, unsigned char - return 0; - } - --int sd_rtnl_message_route_get_src_prefixlen(sd_netlink_message *m, unsigned char *src_len) { -+_public_ int sd_rtnl_message_route_get_src_prefixlen(sd_netlink_message *m, unsigned char *src_len) { - struct rtmsg *rtm; - - assert_return(m, -EINVAL); -@@ -283,7 +283,7 @@ int sd_rtnl_message_route_get_src_prefixlen(sd_netlink_message *m, unsigned char - return 0; - } - --int sd_rtnl_message_new_route(sd_netlink *rtnl, sd_netlink_message **ret, -+_public_ int sd_rtnl_message_new_route(sd_netlink *rtnl, sd_netlink_message **ret, - uint16_t nlmsg_type, int rtm_family, - unsigned char rtm_protocol) { - struct rtmsg *rtm; -@@ -309,7 +309,7 @@ int sd_rtnl_message_new_route(sd_netlink *rtnl, sd_netlink_message **ret, - return 0; - } - --int sd_rtnl_message_new_nexthop(sd_netlink *rtnl, sd_netlink_message **ret, -+_public_ int sd_rtnl_message_new_nexthop(sd_netlink *rtnl, sd_netlink_message **ret, - uint16_t nlmsg_type, int nh_family, - unsigned char nh_protocol) { - struct nhmsg *nhm; -@@ -347,7 +347,7 @@ int sd_rtnl_message_new_nexthop(sd_netlink *rtnl, sd_netlink_message **ret, - return 0; - } - --int sd_rtnl_message_nexthop_set_flags(sd_netlink_message *m, uint8_t flags) { -+_public_ int sd_rtnl_message_nexthop_set_flags(sd_netlink_message *m, uint8_t flags) { - struct nhmsg *nhm; - - assert_return(m, -EINVAL); -@@ -360,7 +360,7 @@ int sd_rtnl_message_nexthop_set_flags(sd_netlink_message *m, uint8_t flags) { - return 0; - } - --int sd_rtnl_message_nexthop_get_flags(sd_netlink_message *m, uint8_t *ret) { -+_public_ int sd_rtnl_message_nexthop_get_flags(sd_netlink_message *m, uint8_t *ret) { - struct nhmsg *nhm; - - assert_return(m, -EINVAL); -@@ -374,7 +374,7 @@ int sd_rtnl_message_nexthop_get_flags(sd_netlink_message *m, uint8_t *ret) { - return 0; - } - --int sd_rtnl_message_nexthop_get_family(sd_netlink_message *m, uint8_t *family) { -+_public_ int sd_rtnl_message_nexthop_get_family(sd_netlink_message *m, uint8_t *family) { - struct nhmsg *nhm; - - assert_return(m, -EINVAL); -@@ -388,7 +388,7 @@ int sd_rtnl_message_nexthop_get_family(sd_netlink_message *m, uint8_t *family) { - return 0; - } - --int sd_rtnl_message_nexthop_get_protocol(sd_netlink_message *m, uint8_t *protocol) { -+_public_ int sd_rtnl_message_nexthop_get_protocol(sd_netlink_message *m, uint8_t *protocol) { - struct nhmsg *nhm; - - assert_return(m, -EINVAL); -@@ -402,7 +402,7 @@ int sd_rtnl_message_nexthop_get_protocol(sd_netlink_message *m, uint8_t *protoco - return 0; - } - --int sd_rtnl_message_neigh_set_flags(sd_netlink_message *m, uint8_t flags) { -+_public_ int sd_rtnl_message_neigh_set_flags(sd_netlink_message *m, uint8_t flags) { - struct ndmsg *ndm; - - assert_return(m, -EINVAL); -@@ -415,7 +415,7 @@ int sd_rtnl_message_neigh_set_flags(sd_netlink_message *m, uint8_t flags) { - return 0; - } - --int sd_rtnl_message_neigh_set_state(sd_netlink_message *m, uint16_t state) { -+_public_ int sd_rtnl_message_neigh_set_state(sd_netlink_message *m, uint16_t state) { - struct ndmsg *ndm; - - assert_return(m, -EINVAL); -@@ -428,7 +428,7 @@ int sd_rtnl_message_neigh_set_state(sd_netlink_message *m, uint16_t state) { - return 0; - } - --int sd_rtnl_message_neigh_get_flags(sd_netlink_message *m, uint8_t *flags) { -+_public_ int sd_rtnl_message_neigh_get_flags(sd_netlink_message *m, uint8_t *flags) { - struct ndmsg *ndm; - - assert_return(m, -EINVAL); -@@ -441,7 +441,7 @@ int sd_rtnl_message_neigh_get_flags(sd_netlink_message *m, uint8_t *flags) { - return 0; - } - --int sd_rtnl_message_neigh_get_state(sd_netlink_message *m, uint16_t *state) { -+_public_ int sd_rtnl_message_neigh_get_state(sd_netlink_message *m, uint16_t *state) { - struct ndmsg *ndm; - - assert_return(m, -EINVAL); -@@ -454,7 +454,7 @@ int sd_rtnl_message_neigh_get_state(sd_netlink_message *m, uint16_t *state) { - return 0; - } - --int sd_rtnl_message_neigh_get_family(sd_netlink_message *m, int *family) { -+_public_ int sd_rtnl_message_neigh_get_family(sd_netlink_message *m, int *family) { - struct ndmsg *ndm; - - assert_return(m, -EINVAL); -@@ -469,7 +469,7 @@ int sd_rtnl_message_neigh_get_family(sd_netlink_message *m, int *family) { - return 0; - } - --int sd_rtnl_message_neigh_get_ifindex(sd_netlink_message *m, int *index) { -+_public_ int sd_rtnl_message_neigh_get_ifindex(sd_netlink_message *m, int *index) { - struct ndmsg *ndm; - - assert_return(m, -EINVAL); -@@ -484,7 +484,7 @@ int sd_rtnl_message_neigh_get_ifindex(sd_netlink_message *m, int *index) { - return 0; - } - --int sd_rtnl_message_new_neigh( -+_public_ int sd_rtnl_message_new_neigh( - sd_netlink *rtnl, - sd_netlink_message **ret, - uint16_t nlmsg_type, -@@ -517,7 +517,7 @@ int sd_rtnl_message_new_neigh( - return 0; - } - --int sd_rtnl_message_link_set_flags(sd_netlink_message *m, unsigned flags, unsigned change) { -+_public_ int sd_rtnl_message_link_set_flags(sd_netlink_message *m, unsigned flags, unsigned change) { - struct ifinfomsg *ifi; - - assert_return(m, -EINVAL); -@@ -533,7 +533,7 @@ int sd_rtnl_message_link_set_flags(sd_netlink_message *m, unsigned flags, unsign - return 0; - } - --int sd_rtnl_message_link_set_type(sd_netlink_message *m, unsigned type) { -+_public_ int sd_rtnl_message_link_set_type(sd_netlink_message *m, unsigned type) { - struct ifinfomsg *ifi; - - assert_return(m, -EINVAL); -@@ -547,7 +547,7 @@ int sd_rtnl_message_link_set_type(sd_netlink_message *m, unsigned type) { - return 0; - } - --int sd_rtnl_message_link_set_family(sd_netlink_message *m, unsigned family) { -+_public_ int sd_rtnl_message_link_set_family(sd_netlink_message *m, unsigned family) { - struct ifinfomsg *ifi; - - assert_return(m, -EINVAL); -@@ -561,7 +561,7 @@ int sd_rtnl_message_link_set_family(sd_netlink_message *m, unsigned family) { - return 0; - } - --int sd_rtnl_message_new_link(sd_netlink *rtnl, sd_netlink_message **ret, -+_public_ int sd_rtnl_message_new_link(sd_netlink *rtnl, sd_netlink_message **ret, - uint16_t nlmsg_type, int index) { - struct ifinfomsg *ifi; - int r; -@@ -586,7 +586,7 @@ int sd_rtnl_message_new_link(sd_netlink *rtnl, sd_netlink_message **ret, - return 0; - } - --int sd_rtnl_message_addr_set_prefixlen(sd_netlink_message *m, unsigned char prefixlen) { -+_public_ int sd_rtnl_message_addr_set_prefixlen(sd_netlink_message *m, unsigned char prefixlen) { - struct ifaddrmsg *ifa; - - assert_return(m, -EINVAL); -@@ -604,7 +604,7 @@ int sd_rtnl_message_addr_set_prefixlen(sd_netlink_message *m, unsigned char pref - return 0; - } - --int sd_rtnl_message_addr_set_flags(sd_netlink_message *m, unsigned char flags) { -+_public_ int sd_rtnl_message_addr_set_flags(sd_netlink_message *m, unsigned char flags) { - struct ifaddrmsg *ifa; - - assert_return(m, -EINVAL); -@@ -618,7 +618,7 @@ int sd_rtnl_message_addr_set_flags(sd_netlink_message *m, unsigned char flags) { - return 0; - } - --int sd_rtnl_message_addr_set_scope(sd_netlink_message *m, unsigned char scope) { -+_public_ int sd_rtnl_message_addr_set_scope(sd_netlink_message *m, unsigned char scope) { - struct ifaddrmsg *ifa; - - assert_return(m, -EINVAL); -@@ -632,7 +632,7 @@ int sd_rtnl_message_addr_set_scope(sd_netlink_message *m, unsigned char scope) { - return 0; - } - --int sd_rtnl_message_addr_get_family(sd_netlink_message *m, int *ret_family) { -+_public_ int sd_rtnl_message_addr_get_family(sd_netlink_message *m, int *ret_family) { - struct ifaddrmsg *ifa; - - assert_return(m, -EINVAL); -@@ -647,7 +647,7 @@ int sd_rtnl_message_addr_get_family(sd_netlink_message *m, int *ret_family) { - return 0; - } - --int sd_rtnl_message_addr_get_prefixlen(sd_netlink_message *m, unsigned char *ret_prefixlen) { -+_public_ int sd_rtnl_message_addr_get_prefixlen(sd_netlink_message *m, unsigned char *ret_prefixlen) { - struct ifaddrmsg *ifa; - - assert_return(m, -EINVAL); -@@ -662,7 +662,7 @@ int sd_rtnl_message_addr_get_prefixlen(sd_netlink_message *m, unsigned char *ret - return 0; - } - --int sd_rtnl_message_addr_get_scope(sd_netlink_message *m, unsigned char *ret_scope) { -+_public_ int sd_rtnl_message_addr_get_scope(sd_netlink_message *m, unsigned char *ret_scope) { - struct ifaddrmsg *ifa; - - assert_return(m, -EINVAL); -@@ -677,7 +677,7 @@ int sd_rtnl_message_addr_get_scope(sd_netlink_message *m, unsigned char *ret_sco - return 0; - } - --int sd_rtnl_message_addr_get_flags(sd_netlink_message *m, unsigned char *ret_flags) { -+_public_ int sd_rtnl_message_addr_get_flags(sd_netlink_message *m, unsigned char *ret_flags) { - struct ifaddrmsg *ifa; - - assert_return(m, -EINVAL); -@@ -692,7 +692,7 @@ int sd_rtnl_message_addr_get_flags(sd_netlink_message *m, unsigned char *ret_fla - return 0; - } - --int sd_rtnl_message_addr_get_ifindex(sd_netlink_message *m, int *ret_ifindex) { -+_public_ int sd_rtnl_message_addr_get_ifindex(sd_netlink_message *m, int *ret_ifindex) { - struct ifaddrmsg *ifa; - - assert_return(m, -EINVAL); -@@ -707,7 +707,7 @@ int sd_rtnl_message_addr_get_ifindex(sd_netlink_message *m, int *ret_ifindex) { - return 0; - } - --int sd_rtnl_message_new_addr( -+_public_ int sd_rtnl_message_new_addr( - sd_netlink *rtnl, - sd_netlink_message **ret, - uint16_t nlmsg_type, -@@ -736,7 +736,7 @@ int sd_rtnl_message_new_addr( - return 0; - } - --int sd_rtnl_message_new_addr_update( -+_public_ int sd_rtnl_message_new_addr_update( - sd_netlink *rtnl, - sd_netlink_message **ret, - int index, -@@ -752,7 +752,7 @@ int sd_rtnl_message_new_addr_update( - return 0; - } - --int sd_rtnl_message_link_get_ifindex(sd_netlink_message *m, int *ifindex) { -+_public_ int sd_rtnl_message_link_get_ifindex(sd_netlink_message *m, int *ifindex) { - struct ifinfomsg *ifi; - - assert_return(m, -EINVAL); -@@ -767,7 +767,7 @@ int sd_rtnl_message_link_get_ifindex(sd_netlink_message *m, int *ifindex) { - return 0; - } - --int sd_rtnl_message_link_get_flags(sd_netlink_message *m, unsigned *flags) { -+_public_ int sd_rtnl_message_link_get_flags(sd_netlink_message *m, unsigned *flags) { - struct ifinfomsg *ifi; - - assert_return(m, -EINVAL); -@@ -782,7 +782,7 @@ int sd_rtnl_message_link_get_flags(sd_netlink_message *m, unsigned *flags) { - return 0; - } - --int sd_rtnl_message_link_get_type(sd_netlink_message *m, unsigned short *type) { -+_public_ int sd_rtnl_message_link_get_type(sd_netlink_message *m, unsigned short *type) { - struct ifinfomsg *ifi; - - assert_return(m, -EINVAL); -@@ -797,7 +797,7 @@ int sd_rtnl_message_link_get_type(sd_netlink_message *m, unsigned short *type) { - return 0; - } - --int sd_rtnl_message_get_family(sd_netlink_message *m, int *family) { -+_public_ int sd_rtnl_message_get_family(sd_netlink_message *m, int *family) { - assert_return(m, -EINVAL); - assert_return(family, -EINVAL); - -@@ -856,7 +856,7 @@ int sd_rtnl_message_get_family(sd_netlink_message *m, int *family) { - return -EOPNOTSUPP; - } - --int sd_rtnl_message_new_addrlabel( -+_public_ int sd_rtnl_message_new_addrlabel( - sd_netlink *rtnl, - sd_netlink_message **ret, - uint16_t nlmsg_type, -@@ -884,7 +884,7 @@ int sd_rtnl_message_new_addrlabel( - return 0; - } - --int sd_rtnl_message_addrlabel_set_prefixlen(sd_netlink_message *m, unsigned char prefixlen) { -+_public_ int sd_rtnl_message_addrlabel_set_prefixlen(sd_netlink_message *m, unsigned char prefixlen) { - struct ifaddrlblmsg *addrlabel; - - assert_return(m, -EINVAL); -@@ -901,7 +901,7 @@ int sd_rtnl_message_addrlabel_set_prefixlen(sd_netlink_message *m, unsigned char - return 0; - } - --int sd_rtnl_message_addrlabel_get_prefixlen(sd_netlink_message *m, unsigned char *prefixlen) { -+_public_ int sd_rtnl_message_addrlabel_get_prefixlen(sd_netlink_message *m, unsigned char *prefixlen) { - struct ifaddrlblmsg *addrlabel; - - assert_return(m, -EINVAL); -@@ -915,7 +915,7 @@ int sd_rtnl_message_addrlabel_get_prefixlen(sd_netlink_message *m, unsigned char - return 0; - } - --int sd_rtnl_message_new_routing_policy_rule( -+_public_ int sd_rtnl_message_new_routing_policy_rule( - sd_netlink *rtnl, - sd_netlink_message **ret, - uint16_t nlmsg_type, -@@ -940,7 +940,7 @@ int sd_rtnl_message_new_routing_policy_rule( - return 0; - } - --int sd_rtnl_message_routing_policy_rule_set_tos(sd_netlink_message *m, uint8_t tos) { -+_public_ int sd_rtnl_message_routing_policy_rule_set_tos(sd_netlink_message *m, uint8_t tos) { - struct fib_rule_hdr *frh; - - assert_return(m, -EINVAL); -@@ -954,7 +954,7 @@ int sd_rtnl_message_routing_policy_rule_set_tos(sd_netlink_message *m, uint8_t t - return 0; - } - --int sd_rtnl_message_routing_policy_rule_get_tos(sd_netlink_message *m, uint8_t *tos) { -+_public_ int sd_rtnl_message_routing_policy_rule_get_tos(sd_netlink_message *m, uint8_t *tos) { - struct fib_rule_hdr *frh; - - assert_return(m, -EINVAL); -@@ -968,7 +968,7 @@ int sd_rtnl_message_routing_policy_rule_get_tos(sd_netlink_message *m, uint8_t * - return 0; - } - --int sd_rtnl_message_routing_policy_rule_set_table(sd_netlink_message *m, uint8_t table) { -+_public_ int sd_rtnl_message_routing_policy_rule_set_table(sd_netlink_message *m, uint8_t table) { - struct fib_rule_hdr *frh; - - assert_return(m, -EINVAL); -@@ -982,7 +982,7 @@ int sd_rtnl_message_routing_policy_rule_set_table(sd_netlink_message *m, uint8_t - return 0; - } - --int sd_rtnl_message_routing_policy_rule_get_table(sd_netlink_message *m, uint8_t *table) { -+_public_ int sd_rtnl_message_routing_policy_rule_get_table(sd_netlink_message *m, uint8_t *table) { - struct fib_rule_hdr *frh; - - assert_return(m, -EINVAL); -@@ -996,7 +996,7 @@ int sd_rtnl_message_routing_policy_rule_get_table(sd_netlink_message *m, uint8_t - return 0; - } - --int sd_rtnl_message_routing_policy_rule_set_flags(sd_netlink_message *m, uint32_t flags) { -+_public_ int sd_rtnl_message_routing_policy_rule_set_flags(sd_netlink_message *m, uint32_t flags) { - struct fib_rule_hdr *frh; - - assert_return(m, -EINVAL); -@@ -1009,7 +1009,7 @@ int sd_rtnl_message_routing_policy_rule_set_flags(sd_netlink_message *m, uint32_ - return 0; - } - --int sd_rtnl_message_routing_policy_rule_get_flags(sd_netlink_message *m, uint32_t *flags) { -+_public_ int sd_rtnl_message_routing_policy_rule_get_flags(sd_netlink_message *m, uint32_t *flags) { - struct fib_rule_hdr *frh; - - assert_return(m, -EINVAL); -@@ -1022,7 +1022,7 @@ int sd_rtnl_message_routing_policy_rule_get_flags(sd_netlink_message *m, uint32_ - return 0; - } - --int sd_rtnl_message_routing_policy_rule_set_fib_type(sd_netlink_message *m, uint8_t type) { -+_public_ int sd_rtnl_message_routing_policy_rule_set_fib_type(sd_netlink_message *m, uint8_t type) { - struct fib_rule_hdr *frh; - - assert_return(m, -EINVAL); -@@ -1036,7 +1036,7 @@ int sd_rtnl_message_routing_policy_rule_set_fib_type(sd_netlink_message *m, uint - return 0; - } - --int sd_rtnl_message_routing_policy_rule_get_fib_type(sd_netlink_message *m, uint8_t *type) { -+_public_ int sd_rtnl_message_routing_policy_rule_get_fib_type(sd_netlink_message *m, uint8_t *type) { - struct fib_rule_hdr *frh; - - assert_return(m, -EINVAL); -@@ -1050,7 +1050,7 @@ int sd_rtnl_message_routing_policy_rule_get_fib_type(sd_netlink_message *m, uint - return 0; - } - --int sd_rtnl_message_routing_policy_rule_set_fib_dst_prefixlen(sd_netlink_message *m, uint8_t len) { -+_public_ int sd_rtnl_message_routing_policy_rule_set_fib_dst_prefixlen(sd_netlink_message *m, uint8_t len) { - struct fib_rule_hdr *frh; - - assert_return(m, -EINVAL); -@@ -1064,7 +1064,7 @@ int sd_rtnl_message_routing_policy_rule_set_fib_dst_prefixlen(sd_netlink_message - return 0; - } - --int sd_rtnl_message_routing_policy_rule_get_fib_dst_prefixlen(sd_netlink_message *m, uint8_t *len) { -+_public_ int sd_rtnl_message_routing_policy_rule_get_fib_dst_prefixlen(sd_netlink_message *m, uint8_t *len) { - struct fib_rule_hdr *frh; - - assert_return(m, -EINVAL); -@@ -1078,7 +1078,7 @@ int sd_rtnl_message_routing_policy_rule_get_fib_dst_prefixlen(sd_netlink_message - return 0; - } - --int sd_rtnl_message_routing_policy_rule_set_fib_src_prefixlen(sd_netlink_message *m, uint8_t len) { -+_public_ int sd_rtnl_message_routing_policy_rule_set_fib_src_prefixlen(sd_netlink_message *m, uint8_t len) { - struct fib_rule_hdr *frh; - - assert_return(m, -EINVAL); -@@ -1092,7 +1092,7 @@ int sd_rtnl_message_routing_policy_rule_set_fib_src_prefixlen(sd_netlink_message - return 0; - } - --int sd_rtnl_message_routing_policy_rule_get_fib_src_prefixlen(sd_netlink_message *m, uint8_t *len) { -+_public_ int sd_rtnl_message_routing_policy_rule_get_fib_src_prefixlen(sd_netlink_message *m, uint8_t *len) { - struct fib_rule_hdr *frh; - - assert_return(m, -EINVAL); -@@ -1106,7 +1106,7 @@ int sd_rtnl_message_routing_policy_rule_get_fib_src_prefixlen(sd_netlink_message - return 0; - } - --int sd_rtnl_message_new_traffic_control( -+_public_ int sd_rtnl_message_new_traffic_control( - sd_netlink *rtnl, - sd_netlink_message **ret, - uint16_t nlmsg_type, -@@ -1135,7 +1135,7 @@ int sd_rtnl_message_new_traffic_control( - return 0; - } - --int sd_rtnl_message_traffic_control_get_ifindex(sd_netlink_message *m, int *ret) { -+_public_ int sd_rtnl_message_traffic_control_get_ifindex(sd_netlink_message *m, int *ret) { - struct tcmsg *tcm; - - assert_return(m, -EINVAL); -@@ -1149,7 +1149,7 @@ int sd_rtnl_message_traffic_control_get_ifindex(sd_netlink_message *m, int *ret) - return 0; - } - --int sd_rtnl_message_traffic_control_get_handle(sd_netlink_message *m, uint32_t *ret) { -+_public_ int sd_rtnl_message_traffic_control_get_handle(sd_netlink_message *m, uint32_t *ret) { - struct tcmsg *tcm; - - assert_return(m, -EINVAL); -@@ -1163,7 +1163,7 @@ int sd_rtnl_message_traffic_control_get_handle(sd_netlink_message *m, uint32_t * - return 0; - } - --int sd_rtnl_message_traffic_control_get_parent(sd_netlink_message *m, uint32_t *ret) { -+_public_ int sd_rtnl_message_traffic_control_get_parent(sd_netlink_message *m, uint32_t *ret) { - struct tcmsg *tcm; - - assert_return(m, -EINVAL); -@@ -1177,7 +1177,7 @@ int sd_rtnl_message_traffic_control_get_parent(sd_netlink_message *m, uint32_t * - return 0; - } - --int sd_rtnl_message_new_mdb( -+_public_ int sd_rtnl_message_new_mdb( - sd_netlink *rtnl, - sd_netlink_message **ret, - uint16_t nlmsg_type, -diff --git a/src/libsystemd/sd-netlink/netlink-message.c b/src/libsystemd/sd-netlink/netlink-message.c -index 000a50ee3e..33bec2ac9b 100644 ---- a/src/libsystemd/sd-netlink/netlink-message.c -+++ b/src/libsystemd/sd-netlink/netlink-message.c -@@ -113,7 +113,7 @@ int message_new_synthetic_error(sd_netlink *nl, int error, uint32_t serial, sd_n - return 0; - } - --int sd_netlink_message_set_request_dump(sd_netlink_message *m, int dump) { -+_public_ int sd_netlink_message_set_request_dump(sd_netlink_message *m, int dump) { - assert_return(m, -EINVAL); - assert_return(m->hdr, -EINVAL); - assert_return(m->protocol != NETLINK_ROUTE || -@@ -129,7 +129,7 @@ int sd_netlink_message_set_request_dump(sd_netlink_message *m, int dump) { - - DEFINE_TRIVIAL_REF_FUNC(sd_netlink_message, sd_netlink_message); - --sd_netlink_message* sd_netlink_message_unref(sd_netlink_message *m) { -+_public_ sd_netlink_message* sd_netlink_message_unref(sd_netlink_message *m) { - while (m && --m->n_ref == 0) { - unsigned i; - -@@ -146,7 +146,7 @@ sd_netlink_message* sd_netlink_message_unref(sd_netlink_message *m) { - return NULL; - } - --int sd_netlink_message_get_type(sd_netlink_message *m, uint16_t *ret) { -+_public_ int sd_netlink_message_get_type(sd_netlink_message *m, uint16_t *ret) { - assert_return(m, -EINVAL); - assert_return(ret, -EINVAL); - -@@ -155,7 +155,7 @@ int sd_netlink_message_get_type(sd_netlink_message *m, uint16_t *ret) { - return 0; - } - --int sd_netlink_message_set_flags(sd_netlink_message *m, uint16_t flags) { -+_public_ int sd_netlink_message_set_flags(sd_netlink_message *m, uint16_t flags) { - assert_return(m, -EINVAL); - assert_return(flags != 0, -EINVAL); - -@@ -164,7 +164,7 @@ int sd_netlink_message_set_flags(sd_netlink_message *m, uint16_t flags) { - return 0; - } - --int sd_netlink_message_is_broadcast(sd_netlink_message *m) { -+_public_ int sd_netlink_message_is_broadcast(sd_netlink_message *m) { - assert_return(m, -EINVAL); - - return m->multicast_group != 0; -@@ -230,7 +230,7 @@ static int message_attribute_has_type(sd_netlink_message *m, size_t *ret_size, u - return 0; - } - --int sd_netlink_message_append_string(sd_netlink_message *m, uint16_t attr_type, const char *data) { -+_public_ int sd_netlink_message_append_string(sd_netlink_message *m, uint16_t attr_type, const char *data) { - size_t length, size; - int r; - -@@ -256,7 +256,7 @@ int sd_netlink_message_append_string(sd_netlink_message *m, uint16_t attr_type, - return 0; - } - --int sd_netlink_message_append_strv(sd_netlink_message *m, uint16_t attr_type, const char* const *data) { -+_public_ int sd_netlink_message_append_strv(sd_netlink_message *m, uint16_t attr_type, const char* const *data) { - size_t length, size; - int r; - -@@ -284,7 +284,7 @@ int sd_netlink_message_append_strv(sd_netlink_message *m, uint16_t attr_type, co - return 0; - } - --int sd_netlink_message_append_flag(sd_netlink_message *m, uint16_t attr_type) { -+_public_ int sd_netlink_message_append_flag(sd_netlink_message *m, uint16_t attr_type) { - size_t size; - int r; - -@@ -302,7 +302,7 @@ int sd_netlink_message_append_flag(sd_netlink_message *m, uint16_t attr_type) { - return 0; - } - --int sd_netlink_message_append_u8(sd_netlink_message *m, uint16_t attr_type, uint8_t data) { -+_public_ int sd_netlink_message_append_u8(sd_netlink_message *m, uint16_t attr_type, uint8_t data) { - int r; - - assert_return(m, -EINVAL); -@@ -319,7 +319,7 @@ int sd_netlink_message_append_u8(sd_netlink_message *m, uint16_t attr_type, uint - return 0; - } - --int sd_netlink_message_append_u16(sd_netlink_message *m, uint16_t attr_type, uint16_t data) { -+_public_ int sd_netlink_message_append_u16(sd_netlink_message *m, uint16_t attr_type, uint16_t data) { - int r; - - assert_return(m, -EINVAL); -@@ -336,7 +336,7 @@ int sd_netlink_message_append_u16(sd_netlink_message *m, uint16_t attr_type, uin - return 0; - } - --int sd_netlink_message_append_u32(sd_netlink_message *m, uint16_t attr_type, uint32_t data) { -+_public_ int sd_netlink_message_append_u32(sd_netlink_message *m, uint16_t attr_type, uint32_t data) { - int r; - - assert_return(m, -EINVAL); -@@ -353,7 +353,7 @@ int sd_netlink_message_append_u32(sd_netlink_message *m, uint16_t attr_type, uin - return 0; - } - --int sd_netlink_message_append_u64(sd_netlink_message *m, uint16_t attr_type, uint64_t data) { -+_public_ int sd_netlink_message_append_u64(sd_netlink_message *m, uint16_t attr_type, uint64_t data) { - int r; - - assert_return(m, -EINVAL); -@@ -370,7 +370,7 @@ int sd_netlink_message_append_u64(sd_netlink_message *m, uint16_t attr_type, uin - return 0; - } - --int sd_netlink_message_append_s8(sd_netlink_message *m, uint16_t attr_type, int8_t data) { -+_public_ int sd_netlink_message_append_s8(sd_netlink_message *m, uint16_t attr_type, int8_t data) { - int r; - - assert_return(m, -EINVAL); -@@ -387,7 +387,7 @@ int sd_netlink_message_append_s8(sd_netlink_message *m, uint16_t attr_type, int8 - return 0; - } - --int sd_netlink_message_append_s16(sd_netlink_message *m, uint16_t attr_type, int16_t data) { -+_public_ int sd_netlink_message_append_s16(sd_netlink_message *m, uint16_t attr_type, int16_t data) { - int r; - - assert_return(m, -EINVAL); -@@ -404,7 +404,7 @@ int sd_netlink_message_append_s16(sd_netlink_message *m, uint16_t attr_type, int - return 0; - } - --int sd_netlink_message_append_s32(sd_netlink_message *m, uint16_t attr_type, int32_t data) { -+_public_ int sd_netlink_message_append_s32(sd_netlink_message *m, uint16_t attr_type, int32_t data) { - int r; - - assert_return(m, -EINVAL); -@@ -421,7 +421,7 @@ int sd_netlink_message_append_s32(sd_netlink_message *m, uint16_t attr_type, int - return 0; - } - --int sd_netlink_message_append_s64(sd_netlink_message *m, uint16_t attr_type, int64_t data) { -+_public_ int sd_netlink_message_append_s64(sd_netlink_message *m, uint16_t attr_type, int64_t data) { - int r; - - assert_return(m, -EINVAL); -@@ -438,7 +438,7 @@ int sd_netlink_message_append_s64(sd_netlink_message *m, uint16_t attr_type, int - return 0; - } - --int sd_netlink_message_append_data(sd_netlink_message *m, uint16_t attr_type, const void *data, size_t len) { -+_public_ int sd_netlink_message_append_data(sd_netlink_message *m, uint16_t attr_type, const void *data, size_t len) { - int r; - - assert_return(m, -EINVAL); -@@ -451,7 +451,7 @@ int sd_netlink_message_append_data(sd_netlink_message *m, uint16_t attr_type, co - return 0; - } - --int sd_netlink_message_append_container_data( -+_public_ int sd_netlink_message_append_container_data( - sd_netlink_message *m, - uint16_t container_type, - uint16_t attr_type, -@@ -493,11 +493,11 @@ int netlink_message_append_in_addr_union(sd_netlink_message *m, uint16_t attr_ty - return 0; - } - --int sd_netlink_message_append_in_addr(sd_netlink_message *m, uint16_t attr_type, const struct in_addr *data) { -+_public_ int sd_netlink_message_append_in_addr(sd_netlink_message *m, uint16_t attr_type, const struct in_addr *data) { - return netlink_message_append_in_addr_union(m, attr_type, AF_INET, (const union in_addr_union *) data); - } - --int sd_netlink_message_append_in6_addr(sd_netlink_message *m, uint16_t attr_type, const struct in6_addr *data) { -+_public_ int sd_netlink_message_append_in6_addr(sd_netlink_message *m, uint16_t attr_type, const struct in6_addr *data) { - return netlink_message_append_in_addr_union(m, attr_type, AF_INET6, (const union in_addr_union *) data); - } - -@@ -520,15 +520,15 @@ int netlink_message_append_sockaddr_union(sd_netlink_message *m, uint16_t attr_t - return 0; - } - --int sd_netlink_message_append_sockaddr_in(sd_netlink_message *m, uint16_t attr_type, const struct sockaddr_in *data) { -+_public_ int sd_netlink_message_append_sockaddr_in(sd_netlink_message *m, uint16_t attr_type, const struct sockaddr_in *data) { - return netlink_message_append_sockaddr_union(m, attr_type, (const union sockaddr_union *) data); - } - --int sd_netlink_message_append_sockaddr_in6(sd_netlink_message *m, uint16_t attr_type, const struct sockaddr_in6 *data) { -+_public_ int sd_netlink_message_append_sockaddr_in6(sd_netlink_message *m, uint16_t attr_type, const struct sockaddr_in6 *data) { - return netlink_message_append_sockaddr_union(m, attr_type, (const union sockaddr_union *) data); - } - --int sd_netlink_message_append_ether_addr(sd_netlink_message *m, uint16_t attr_type, const struct ether_addr *data) { -+_public_ int sd_netlink_message_append_ether_addr(sd_netlink_message *m, uint16_t attr_type, const struct ether_addr *data) { - int r; - - assert_return(m, -EINVAL); -@@ -565,7 +565,7 @@ int netlink_message_append_hw_addr(sd_netlink_message *m, uint16_t attr_type, co - return 0; - } - --int sd_netlink_message_append_cache_info(sd_netlink_message *m, uint16_t attr_type, const struct ifa_cacheinfo *info) { -+_public_ int sd_netlink_message_append_cache_info(sd_netlink_message *m, uint16_t attr_type, const struct ifa_cacheinfo *info) { - int r; - - assert_return(m, -EINVAL); -@@ -583,7 +583,7 @@ int sd_netlink_message_append_cache_info(sd_netlink_message *m, uint16_t attr_ty - return 0; - } - --int sd_netlink_message_open_container(sd_netlink_message *m, uint16_t attr_type) { -+_public_ int sd_netlink_message_open_container(sd_netlink_message *m, uint16_t attr_type) { - size_t size; - int r; - -@@ -632,7 +632,7 @@ int sd_netlink_message_open_container(sd_netlink_message *m, uint16_t attr_type) - return 0; - } - --int sd_netlink_message_open_container_union(sd_netlink_message *m, uint16_t attr_type, const char *key) { -+_public_ int sd_netlink_message_open_container_union(sd_netlink_message *m, uint16_t attr_type, const char *key) { - const NLAPolicySetUnion *policy_set_union; - int r; - -@@ -671,7 +671,7 @@ int sd_netlink_message_open_container_union(sd_netlink_message *m, uint16_t attr - return 0; - } - --int sd_netlink_message_close_container(sd_netlink_message *m) { -+_public_ int sd_netlink_message_close_container(sd_netlink_message *m) { - assert_return(m, -EINVAL); - assert_return(!m->sealed, -EPERM); - assert_return(m->n_containers > 0, -EINVAL); -@@ -683,7 +683,7 @@ int sd_netlink_message_close_container(sd_netlink_message *m) { - return 0; - } - --int sd_netlink_message_open_array(sd_netlink_message *m, uint16_t attr_type) { -+_public_ int sd_netlink_message_open_array(sd_netlink_message *m, uint16_t attr_type) { - int r; - - assert_return(m, -EINVAL); -@@ -701,7 +701,7 @@ int sd_netlink_message_open_array(sd_netlink_message *m, uint16_t attr_type) { - return 0; - } - --int sd_netlink_message_cancel_array(sd_netlink_message *m) { -+_public_ int sd_netlink_message_cancel_array(sd_netlink_message *m) { - uint32_t rta_len; - - assert_return(m, -EINVAL); -@@ -757,7 +757,7 @@ static int netlink_message_read_internal( - return RTA_PAYLOAD(rta); - } - --int sd_netlink_message_read(sd_netlink_message *m, uint16_t attr_type, size_t size, void *data) { -+_public_ int sd_netlink_message_read(sd_netlink_message *m, uint16_t attr_type, size_t size, void *data) { - void *attr_data; - int r; - -@@ -776,7 +776,7 @@ int sd_netlink_message_read(sd_netlink_message *m, uint16_t attr_type, size_t si - return r; - } - --int sd_netlink_message_read_data(sd_netlink_message *m, uint16_t attr_type, size_t *ret_size, void **ret_data) { -+_public_ int sd_netlink_message_read_data(sd_netlink_message *m, uint16_t attr_type, size_t *ret_size, void **ret_data) { - void *attr_data; - int r; - -@@ -802,7 +802,7 @@ int sd_netlink_message_read_data(sd_netlink_message *m, uint16_t attr_type, size - return r; - } - --int sd_netlink_message_read_data_suffix0(sd_netlink_message *m, uint16_t attr_type, size_t *ret_size, void **ret_data) { -+_public_ int sd_netlink_message_read_data_suffix0(sd_netlink_message *m, uint16_t attr_type, size_t *ret_size, void **ret_data) { - void *attr_data; - int r; - -@@ -828,7 +828,7 @@ int sd_netlink_message_read_data_suffix0(sd_netlink_message *m, uint16_t attr_ty - return r; - } - --int sd_netlink_message_read_string_strdup(sd_netlink_message *m, uint16_t attr_type, char **data) { -+_public_ int sd_netlink_message_read_string_strdup(sd_netlink_message *m, uint16_t attr_type, char **data) { - void *attr_data; - int r; - -@@ -855,7 +855,7 @@ int sd_netlink_message_read_string_strdup(sd_netlink_message *m, uint16_t attr_t - return 0; - } - --int sd_netlink_message_read_string(sd_netlink_message *m, uint16_t attr_type, const char **data) { -+_public_ int sd_netlink_message_read_string(sd_netlink_message *m, uint16_t attr_type, const char **data) { - void *attr_data; - int r; - -@@ -878,7 +878,7 @@ int sd_netlink_message_read_string(sd_netlink_message *m, uint16_t attr_type, co - return 0; - } - --int sd_netlink_message_read_u8(sd_netlink_message *m, uint16_t attr_type, uint8_t *data) { -+_public_ int sd_netlink_message_read_u8(sd_netlink_message *m, uint16_t attr_type, uint8_t *data) { - void *attr_data; - int r; - -@@ -901,7 +901,7 @@ int sd_netlink_message_read_u8(sd_netlink_message *m, uint16_t attr_type, uint8_ - return 0; - } - --int sd_netlink_message_read_u16(sd_netlink_message *m, uint16_t attr_type, uint16_t *data) { -+_public_ int sd_netlink_message_read_u16(sd_netlink_message *m, uint16_t attr_type, uint16_t *data) { - void *attr_data; - bool net_byteorder; - int r; -@@ -929,7 +929,7 @@ int sd_netlink_message_read_u16(sd_netlink_message *m, uint16_t attr_type, uint1 - return 0; - } - --int sd_netlink_message_read_u32(sd_netlink_message *m, uint16_t attr_type, uint32_t *data) { -+_public_ int sd_netlink_message_read_u32(sd_netlink_message *m, uint16_t attr_type, uint32_t *data) { - void *attr_data; - bool net_byteorder; - int r; -@@ -957,7 +957,7 @@ int sd_netlink_message_read_u32(sd_netlink_message *m, uint16_t attr_type, uint3 - return 0; - } - --int sd_netlink_message_read_ether_addr(sd_netlink_message *m, uint16_t attr_type, struct ether_addr *data) { -+_public_ int sd_netlink_message_read_ether_addr(sd_netlink_message *m, uint16_t attr_type, struct ether_addr *data) { - void *attr_data; - int r; - -@@ -1005,7 +1005,7 @@ int netlink_message_read_hw_addr(sd_netlink_message *m, uint16_t attr_type, stru - return 0; - } - --int sd_netlink_message_read_cache_info(sd_netlink_message *m, uint16_t attr_type, struct ifa_cacheinfo *info) { -+_public_ int sd_netlink_message_read_cache_info(sd_netlink_message *m, uint16_t attr_type, struct ifa_cacheinfo *info) { - void *attr_data; - int r; - -@@ -1052,7 +1052,7 @@ int netlink_message_read_in_addr_union(sd_netlink_message *m, uint16_t attr_type - return 0; - } - --int sd_netlink_message_read_in_addr(sd_netlink_message *m, uint16_t attr_type, struct in_addr *data) { -+_public_ int sd_netlink_message_read_in_addr(sd_netlink_message *m, uint16_t attr_type, struct in_addr *data) { - union in_addr_union u; - int r; - -@@ -1063,7 +1063,7 @@ int sd_netlink_message_read_in_addr(sd_netlink_message *m, uint16_t attr_type, s - return r; - } - --int sd_netlink_message_read_in6_addr(sd_netlink_message *m, uint16_t attr_type, struct in6_addr *data) { -+_public_ int sd_netlink_message_read_in6_addr(sd_netlink_message *m, uint16_t attr_type, struct in6_addr *data) { - union in_addr_union u; - int r; - -@@ -1074,7 +1074,7 @@ int sd_netlink_message_read_in6_addr(sd_netlink_message *m, uint16_t attr_type, - return r; - } - --int sd_netlink_message_has_flag(sd_netlink_message *m, uint16_t attr_type) { -+_public_ int sd_netlink_message_has_flag(sd_netlink_message *m, uint16_t attr_type) { - void *attr_data; - int r; - -@@ -1095,7 +1095,7 @@ int sd_netlink_message_has_flag(sd_netlink_message *m, uint16_t attr_type) { - return 1; - } - --int sd_netlink_message_read_strv(sd_netlink_message *m, uint16_t container_type, uint16_t attr_type, char ***ret) { -+_public_ int sd_netlink_message_read_strv(sd_netlink_message *m, uint16_t container_type, uint16_t attr_type, char ***ret) { - _cleanup_strv_free_ char **s = NULL; - const NLAPolicySet *policy_set; - const NLAPolicy *policy; -@@ -1192,7 +1192,7 @@ static int netlink_container_parse( - return 0; - } - --int sd_netlink_message_enter_container(sd_netlink_message *m, uint16_t attr_type) { -+_public_ int sd_netlink_message_enter_container(sd_netlink_message *m, uint16_t attr_type) { - const NLAPolicy *policy; - const NLAPolicySet *policy_set; - void *container; -@@ -1279,7 +1279,7 @@ int sd_netlink_message_enter_container(sd_netlink_message *m, uint16_t attr_type - return 0; - } - --int sd_netlink_message_enter_array(sd_netlink_message *m, uint16_t attr_type) { -+_public_ int sd_netlink_message_enter_array(sd_netlink_message *m, uint16_t attr_type) { - void *container; - size_t size; - int r; -@@ -1308,7 +1308,7 @@ int sd_netlink_message_enter_array(sd_netlink_message *m, uint16_t attr_type) { - return 0; - } - --int sd_netlink_message_exit_container(sd_netlink_message *m) { -+_public_ int sd_netlink_message_exit_container(sd_netlink_message *m) { - assert_return(m, -EINVAL); - assert_return(m->sealed, -EINVAL); - assert_return(m->n_containers > 0, -EINVAL); -@@ -1322,7 +1322,7 @@ int sd_netlink_message_exit_container(sd_netlink_message *m) { - return 0; - } - --int sd_netlink_message_get_max_attribute(sd_netlink_message *m, uint16_t *ret) { -+_public_ int sd_netlink_message_get_max_attribute(sd_netlink_message *m, uint16_t *ret) { - assert_return(m, -EINVAL); - assert_return(m->sealed, -EINVAL); - assert_return(ret, -EINVAL); -@@ -1331,14 +1331,14 @@ int sd_netlink_message_get_max_attribute(sd_netlink_message *m, uint16_t *ret) { - return 0; - } - --int sd_netlink_message_is_error(sd_netlink_message *m) { -+_public_ int sd_netlink_message_is_error(sd_netlink_message *m) { - assert_return(m, 0); - assert_return(m->hdr, 0); - - return m->hdr->nlmsg_type == NLMSG_ERROR; - } - --int sd_netlink_message_get_errno(sd_netlink_message *m) { -+_public_ int sd_netlink_message_get_errno(sd_netlink_message *m) { - struct nlmsgerr *err; - - assert_return(m, -EINVAL); -@@ -1373,7 +1373,7 @@ static int netlink_message_parse_error(sd_netlink_message *m) { - NLMSG_PAYLOAD(m->hdr, hlen)); - } - --int sd_netlink_message_rewind(sd_netlink_message *m, sd_netlink *nl) { -+_public_ int sd_netlink_message_rewind(sd_netlink_message *m, sd_netlink *nl) { - size_t size; - int r; - -diff --git a/src/libsystemd/sd-netlink/sd-netlink.c b/src/libsystemd/sd-netlink/sd-netlink.c -index ce0687eb57..fbebcf301b 100644 ---- a/src/libsystemd/sd-netlink/sd-netlink.c -+++ b/src/libsystemd/sd-netlink/sd-netlink.c -@@ -65,7 +65,7 @@ static int netlink_new(sd_netlink **ret) { - return 0; - } - --int sd_netlink_open_fd(sd_netlink **ret, int fd) { -+_public_ int sd_netlink_open_fd(sd_netlink **ret, int fd) { - _cleanup_(sd_netlink_unrefp) sd_netlink *nl = NULL; - int r, protocol; - -@@ -103,11 +103,11 @@ int sd_netlink_open_fd(sd_netlink **ret, int fd) { - return 0; - } - --int sd_netlink_open(sd_netlink **ret) { -+_public_ int sd_netlink_open(sd_netlink **ret) { - return netlink_open_family(ret, NETLINK_ROUTE); - } - --int sd_netlink_increase_rxbuf(sd_netlink *nl, size_t size) { -+_public_ int sd_netlink_increase_rxbuf(sd_netlink *nl, size_t size) { - assert_return(nl, -EINVAL); - assert_return(!netlink_pid_changed(nl), -ECHILD); - -@@ -145,7 +145,7 @@ static sd_netlink *netlink_free(sd_netlink *nl) { - - DEFINE_TRIVIAL_REF_UNREF_FUNC(sd_netlink, sd_netlink, netlink_free); - --int sd_netlink_send( -+_public_ int sd_netlink_send( - sd_netlink *nl, - sd_netlink_message *message, - uint32_t *serial) { -@@ -451,7 +451,7 @@ static int timeout_compare(const void *a, const void *b) { - return CMP(x->timeout, y->timeout); - } - --int sd_netlink_call_async( -+_public_ int sd_netlink_call_async( - sd_netlink *nl, - sd_netlink_slot **ret_slot, - sd_netlink_message *m, -@@ -516,7 +516,7 @@ int sd_netlink_call_async( - return k; - } - --int sd_netlink_read( -+_public_ int sd_netlink_read( - sd_netlink *nl, - uint32_t serial, - uint64_t usec, -@@ -586,7 +586,7 @@ int sd_netlink_read( - } - } - --int sd_netlink_call( -+_public_ int sd_netlink_call( - sd_netlink *nl, - sd_netlink_message *message, - uint64_t usec, -@@ -606,14 +606,14 @@ int sd_netlink_call( - return sd_netlink_read(nl, serial, usec, ret); - } - --int sd_netlink_get_events(sd_netlink *nl) { -+_public_ int sd_netlink_get_events(sd_netlink *nl) { - assert_return(nl, -EINVAL); - assert_return(!netlink_pid_changed(nl), -ECHILD); - - return ordered_set_size(nl->rqueue) == 0 ? POLLIN : 0; - } - --int sd_netlink_get_timeout(sd_netlink *nl, uint64_t *timeout_usec) { -+_public_ int sd_netlink_get_timeout(sd_netlink *nl, uint64_t *timeout_usec) { - struct reply_callback *c; - - assert_return(nl, -EINVAL); -@@ -689,7 +689,7 @@ static int prepare_callback(sd_event_source *s, void *userdata) { - return 1; - } - --int sd_netlink_attach_event(sd_netlink *nl, sd_event *event, int64_t priority) { -+_public_ int sd_netlink_attach_event(sd_netlink *nl, sd_event *event, int64_t priority) { - int r; - - assert_return(nl, -EINVAL); -@@ -741,7 +741,7 @@ fail: - return r; - } - --int sd_netlink_detach_event(sd_netlink *nl) { -+_public_ int sd_netlink_detach_event(sd_netlink *nl) { - assert_return(nl, -EINVAL); - assert_return(nl->event, -ENXIO); - -@@ -804,7 +804,7 @@ int netlink_add_match_internal( - return 0; - } - --int sd_netlink_add_match( -+_public_ int sd_netlink_add_match( - sd_netlink *rtnl, - sd_netlink_slot **ret_slot, - uint16_t type, -@@ -874,7 +874,7 @@ int sd_netlink_add_match( - destroy_callback, userdata, description); - } - --int sd_netlink_attach_filter(sd_netlink *nl, size_t len, const struct sock_filter *filter) { -+_public_ int sd_netlink_attach_filter(sd_netlink *nl, size_t len, const struct sock_filter *filter) { - assert_return(nl, -EINVAL); - assert_return(len == 0 || filter, -EINVAL); - -diff --git a/src/systemd/meson.build b/src/systemd/meson.build -index a9cdcd24a0..03ef60f92a 100644 ---- a/src/systemd/meson.build -+++ b/src/systemd/meson.build -@@ -13,6 +13,7 @@ _systemd_headers = [ - 'sd-journal.h', - 'sd-login.h', - 'sd-messages.h', -+ 'sd-netlink.h', - 'sd-path.h', - ] - -@@ -35,7 +36,6 @@ _not_installed_headers = [ - 'sd-lldp-tx.h', - 'sd-lldp.h', - 'sd-ndisc.h', -- 'sd-netlink.h', - 'sd-network.h', - 'sd-radv.h', - 'sd-resolve.h', --- -2.39.2 - diff --git a/systemd/systemd.nm b/systemd/systemd.nm index bdb1e3f04..51134e988 100644 --- a/systemd/systemd.nm +++ b/systemd/systemd.nm @@ -4,8 +4,8 @@ ###############################################################################
name = systemd -version = 254 -release = 3 +version = 257.3 +release = 2
maintainer = Stefan Schantl stefan.schantl@ipfire.org groups = System/Base @@ -18,7 +18,10 @@ description SysV and LSB init scripts. end
-source_dl = https://github.com/%%7Bname%7D/%%7Bname%7D/archive/v%%7Bversion%7D.tar.gz#/ +# This project is hosted on GitHub +github_version = v%{version} + +source_dl = %{github_url}
build unitdir = %{prefix}/lib/systemd/system @@ -56,8 +59,6 @@ build libcurl-devel libfdisk-devel libgcrypt-devel - libidn-devel - libidn2-devel libmount-devel >= 2.34-2 libpwquality-devel libseccomp-devel @@ -83,7 +84,12 @@ build
export LD_LIBRARY_PATH = %{DIR_APP}/.libs
+ # Disable any kind of automatic or optional + # features configure_options = \ + --auto-features=disabled + + configure_options += \ -Dsysvinit-path= \ -Dsysvrcnd-path= \ -Dnobody-user=nobody \ @@ -103,7 +109,8 @@ build -Dportabled=false \ -Dtimesyncd=false \ -Dtimedated=false \ - -Dpolkit=false + -Dpolkit=false \ + -Dbpf-framework=false
# Assign group ids configure_options += \ @@ -316,8 +323,6 @@ packages # Be sure to stop the old udev before updating. /usr/bin/systemctl stop udev.service udev-trigger.service \ udev-control.socket udev-kernel.socket >/dev/null 2>&1 || : - - %{create_groups} end
script postup diff --git a/wget/wget.nm b/wget/wget.nm index 7264d09ac..38585a5d3 100644 --- a/wget/wget.nm +++ b/wget/wget.nm @@ -5,7 +5,7 @@
name = wget version = 1.25.0 -release = 1 +release = 2
groups = Applications/Internet url = https://www.gnu.org/software/wget/ @@ -24,9 +24,10 @@ source_dl = https://ftp.gnu.org/gnu/wget/
build requires - libidn-devel + libidn2-devel >= 0.14.0 libuuid-devel openssl-devel + pcre2-devel end
export CPPFLAGS = %(pkg-config --cflags openssl)
hooks/post-receive -- IPFire 3.x development tree
-
Michael Tremer