From bb5caf02fffada276b5aa598b3b6faea88ca0784 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 16 Jun 2023 07:40:50 +0100 Subject: gentoo auto-resync : 16:06:2023 - 07:40:49 --- net-misc/Manifest.gz | Bin 54100 -> 54110 bytes net-misc/olsrd/Manifest | 2 + .../olsrd/files/olsrd-0.9.8-clang16-buildfix.patch | 53 +++++++++ net-misc/olsrd/olsrd-0.9.8_p20210612-r1.ebuild | 124 +++++++++++++++++++++ 4 files changed, 179 insertions(+) create mode 100644 net-misc/olsrd/files/olsrd-0.9.8-clang16-buildfix.patch create mode 100644 net-misc/olsrd/olsrd-0.9.8_p20210612-r1.ebuild (limited to 'net-misc') diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz index 02bab0293c29..5f23ee36134b 100644 Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ diff --git a/net-misc/olsrd/Manifest b/net-misc/olsrd/Manifest index 3ddc5e5573d8..43bdd82050b5 100644 --- a/net-misc/olsrd/Manifest +++ b/net-misc/olsrd/Manifest @@ -1,5 +1,7 @@ AUX olsrd 491 BLAKE2B 31844255d3aac5d427ab821a7655201ede53a3ab57ac8da3562e9db473d786c1e9acccf3512ba437d203798114ea1e9eb1fa79f4e5c6eca977b7b1357c2e668e SHA512 26329da5360bd25dacea3fde8c025f0bc34203970d2e75b47157fc0c4a3873cf6e7faa93c0a5a51bf20618846135ab18a09b6157521c3199c0667f969d491c4d AUX olsrd-0.9.0.2-gtk.patch 926 BLAKE2B af444d476ed31190454fc89bd6802a6c41f33625eb05e62338efce126fe06e7c59f021848ba12247d35196864496cab3ac9414bdd9cddda54ea6fb5deb2360e2 SHA512 191bb1cb0da122a9b44a9297e78998f9b1ecc70948dd9ee216b5d4fb56b41072c53249b39a6c0584366c7518ee2d4b161833be2e5289d707693dd0d87f2e6791 +AUX olsrd-0.9.8-clang16-buildfix.patch 1391 BLAKE2B e7f7a94b02835dbd174d76924e48c18788e3900009cec448a8bb55d110843883a60a137fd7f4dede8f9df1d22f59b1d35d837386fcb89db37111f6f8fd677166 SHA512 d74744373de6db07b1592bb49f4fc0bb941bb195c7e639e85bb5dac1e8ce520c1bb383fcfd1f8844ad1765c3d4527650f4e032569d8d2cc6a66daf98f2cc2f2e DIST olsrd-0.9.8_p20210612.tar.gz 14446761 BLAKE2B ef841fcf81ae25acb3c47d70f15e34c614b17c28688e0f718aa45ebabea68844f825a4187bbf5468daa4763c8a2b8c87f5f5a502ce0c5fde1b940f9aa3c6ca5e SHA512 466b762ea1f9ecc4ded3298700d1786b893d87fbcc2e457c75f5adfaaf543e6cea5ab2e63d34814a7c2f65cab895fb19c4cb5a7ec5347b13d0e18703a641126e +EBUILD olsrd-0.9.8_p20210612-r1.ebuild 2707 BLAKE2B bc9044ac238595be130e9067787b7df10b8740853887f24b96fbc2c68f97e1254a1bb45e5db4d7028094421b7578f4583ebf69ffa83f9d7e355af4fabd0d41e0 SHA512 6bc7d1212849f74a2e856eeccaf2e67b8f1f07ca34a8caa9dcaa42891e583de3d2f11cd8d8eec0a148c5f5657ccbf4ea8c24b19d9a1eade9825e43878ad20abd EBUILD olsrd-0.9.8_p20210612.ebuild 2656 BLAKE2B 1e0b9635035033f4acb095b44c9b9ce7dbb31d3f350ef257212655913318f0e376746b9c041518297264f9b3388e02cf5aaa5e5fcf6b00b416984dd0a3f5daaa SHA512 a59c6488fc51b15243789cc28ae4ae073793ef7d480534da0945293460ce6367686bfc4c380ed9e15b6020d82eac9dec5fae9c879bd610d1fb9a2a046b631250 MISC metadata.xml 324 BLAKE2B 0e3d7a0154ecc4a0ae6c8f48bc9b28aad1289e1635783f3a74cf753f6392d530823cb1c1e0034f04c50fae65a2ec67892702737d9052a889353f1c0e63fd2f1f SHA512 d43e748039672d6b51690be28db0f6a19e8e41a7a930721cb3c51e0620f19a3ae603a9a35eb9994118a662a312678f38d5a80c6cf7ecd2d676148366ddcae41b diff --git a/net-misc/olsrd/files/olsrd-0.9.8-clang16-buildfix.patch b/net-misc/olsrd/files/olsrd-0.9.8-clang16-buildfix.patch new file mode 100644 index 000000000000..0194b17362ba --- /dev/null +++ b/net-misc/olsrd/files/olsrd-0.9.8-clang16-buildfix.patch @@ -0,0 +1,53 @@ +https://github.com/OLSR/olsrd/pull/124 +--- a/lib/filtergw/src/olsrd_filtergw.c ++++ b/lib/filtergw/src/olsrd_filtergw.c +@@ -54,6 +54,7 @@ + #include "log.h" + #include "routing_table.h" + #include "olsr_cfg.h" ++#include "parser.h" + + #include + #include +@@ -75,11 +76,19 @@ struct originator_list { + + struct filter_group { + struct originator_list * originator_list; +- struct hna_group * next; ++ struct filter_group * next; + }; + + static struct filter_group * filter_groups = NULL; + ++/* ++ * Delcaring function prototype here, fixes build error with clang-16. ++ * Clang 16 enables -Wimplicit-function-declaration by default, hence the ++ * error. ++ * Refer: https://bugs.gentoo.org/898090 ++ */ ++int should_filter(union olsr_ip_addr * originator); ++ + /* ------------------------------------------------------------------------- + * Function : add_to_originator_list + * Description: Add a new ip to originator list +@@ -304,4 +313,4 @@ int should_filter(union olsr_ip_addr * originator) + } + } + return is_allowlist ? !found : found; +-} +\ No newline at end of file ++} +--- a/src/linux/kernel_routes_nl.c ++++ b/src/linux/kernel_routes_nl.c +@@ -161,7 +161,11 @@ static void rtnetlink_read(int sock, void *data __attribute__ ((unused)), unsign + sizeof(nladdr), + &iov, + 1, ++#ifndef __GLIBC__ ++ 0, ++#else + NULL, ++#endif + 0, + 0 + }; diff --git a/net-misc/olsrd/olsrd-0.9.8_p20210612-r1.ebuild b/net-misc/olsrd/olsrd-0.9.8_p20210612-r1.ebuild new file mode 100644 index 000000000000..1ba8d428f242 --- /dev/null +++ b/net-misc/olsrd/olsrd-0.9.8_p20210612-r1.ebuild @@ -0,0 +1,124 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +# Snapshot to fix build failure with >= bison 3.7 +# bug #735572 +MY_COMMIT="4973feb538b5b98b9d8ac2f8f474202f6d73de78" +DESCRIPTION="An implementation of the Optimized Link State Routing protocol" +HOMEPAGE="http://www.olsr.org/" +SRC_URI="https://github.com/OLSR/olsrd/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" +#SRC_URI="https://github.com/OLSR/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${MY_COMMIT}" + +LICENSE="BSD LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="gtk pud" + +DEPEND=" + gtk? ( + dev-libs/glib:2 + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:2 + ) + pud? ( sci-geosciences/gpsd ) +" +RDEPEND=" + ${DEPEND} +" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-0.9.0.2-gtk.patch + "${FILESDIR}"/${PN}-0.9.8-clang16-buildfix.patch +) + +src_prepare() { + default + + # fix parallel make + # respect AR + # verbose build + # fix default prefix, bug #453440 + sed -i \ + -e '/@echo "\[/d' \ + -e 's|$(MAKECMD)|$(MAKE)|g' \ + -e 's|@$(CC)|$(CC)|g' \ + -e 's|@ar |$(AR) |g' \ + -e '/^prefix/s:/usr/local:/usr:' \ + $( find -name 'Makefile*' ) || die + + # respect LDFLAGS + sed -i \ + -e 's|$(CC)|& $(OLSRD_LDFLAGS)|g' \ + lib/pud/nmealib/Makefile lib/pud/wireformat/Makefile || die +} + +src_configure() { + if ! use pud; then + sed -i -e '/^SUBDIRS/ s|pud||g' Makefile || die + fi +} + +src_compile() { + tc-export PKG_CONFIG + + emake \ + CC="$(tc-getCC)" \ + LIBDIR="/usr/$(get_libdir)/${PN}" \ + OLSRD_LDFLAGS="${LDFLAGS}" \ + OS=linux \ + VERBOSE=1 \ + build_all + + if use gtk; then + emake -C gui/linux-gtk LIBDIR="/usr/$(get_libdir)/${PN}" CC="$(tc-getCC)" + fi +} + +src_install() { + # See bug #715392 re LDCONFIG + emake \ + DESTDIR="${D}" \ + DOCDIR_OLSRD="${D}/usr/share/doc/${PF}" \ + LIBDIR="${D}/usr/$(get_libdir)/${PN}" \ + OS=linux \ + STRIP=true \ + LDCONFIG=true \ + install_all + + if use gtk; then + emake -C gui/linux-gtk \ + DESTDIR="${D}" \ + LIBDIR="${D}/usr/$(get_libdir)/${PN}" \ + install + fi + + doinitd "${FILESDIR}"/${PN} + + gzip -d \ + "${ED}"/usr/share/man/man5/olsrd.conf.5.gz \ + "${ED}"/usr/share/man/man8/olsrd.8.gz \ + || die + + dodoc CHANGELOG \ + valgrind-howto.txt files/olsrd.conf.default.rfc \ + files/olsrd.conf.default.lq \ + lib/arprefresh/README_ARPREFRESH \ + lib/bmf/README_BMF \ + lib/dot_draw/README_DOT_DRAW \ + lib/dyn_gw/README_DYN_GW \ + lib/dyn_gw_plain/README_DYN_GW_PLAIN \ + lib/httpinfo/README_HTTPINFO \ + lib/mini/README_MINI \ + lib/nameservice/README_NAMESERVICE \ + lib/pgraph/README_PGRAPH \ + lib/quagga/README_QUAGGA \ + lib/secure/README_SECURE \ + lib/txtinfo/README_TXTINFO \ + lib/watchdog/README_WATCHDOG +} -- cgit v1.2.3