From 7f83a70ee7d275a5ccd016a5f75799f919c84a78868c6eae85fc431f2f5f5515 Mon Sep 17 00:00:00 2001 From: Wolfgang Frisch Date: Wed, 1 Feb 2023 10:00:33 +0000 Subject: [PATCH] Accepting request 1060849 from home:kukuk:branches:security libnsl is deprecated and will be removed in the future as announced one year ago. Don't link against libnsl just because of a broken configure script if it is not used. - Replace wrong libnsl build require with correct libtirpc one - fix-configure-libwrap-dependencies.diff: libwrap does not depend on libnsl OBS-URL: https://build.opensuse.org/request/show/1060849 OBS-URL: https://build.opensuse.org/package/show/security/argus?expand=0&rev=30 --- argus.changes | 7 +++++++ argus.spec | 8 +++++--- fix-configure-libwrap-dependencies.diff | 13 +++++++++++++ 3 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 fix-configure-libwrap-dependencies.diff diff --git a/argus.changes b/argus.changes index 09819ca..2a23c85 100644 --- a/argus.changes +++ b/argus.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jan 25 10:42:26 UTC 2023 - Thorsten Kukuk + +- Replace wrong libnsl build require with correct libtirpc one +- fix-configure-libwrap-dependencies.diff: libwrap does not + depend on libnsl + ------------------------------------------------------------------- Tue Aug 10 11:50:18 UTC 2021 - Johannes Segitz diff --git a/argus.spec b/argus.spec index 8ea6e19..93f840c 100644 --- a/argus.spec +++ b/argus.spec @@ -1,7 +1,7 @@ # # spec file for package argus # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ Name: argus Version: 3.0.8.3 Release: 0 Summary: Network Monitoring Tool -License: GPL-2.0-only AND LGPL-2.1-only AND BSD-3-Clause AND MIT +License: BSD-3-Clause AND GPL-2.0-only AND LGPL-2.1-only AND MIT Group: Productivity/Networking/Diagnostic URL: https://openargus.org/ Source: https://qosient.com/argus/dev/%{name}-%{version}.tar.gz @@ -29,10 +29,11 @@ Source4: argus_linux.8.gz Source5: argus.service Patch1: %{name}-3.0.6.1-libpcap.patch Patch2: harden_argus.service.patch +Patch3: fix-configure-libwrap-dependencies.diff BuildRequires: bison BuildRequires: flex -BuildRequires: libnsl-devel BuildRequires: libpcap-devel +BuildRequires: libtirpc-devel BuildRequires: systemd-rpm-macros BuildRequires: tcpd-devel BuildRequires: tcsh @@ -58,6 +59,7 @@ Daemon for Argus network monitoring tool. cp %{SOURCE3} . cp %{SOURCE4} man/man8/ %patch2 -p1 +%patch3 -p1 %build #autoreconf -fiv diff --git a/fix-configure-libwrap-dependencies.diff b/fix-configure-libwrap-dependencies.diff new file mode 100644 index 0000000..196a870 --- /dev/null +++ b/fix-configure-libwrap-dependencies.diff @@ -0,0 +1,13 @@ +--- argus-3.0.8.3/configure.old 2020-08-27 15:02:52.000000000 +0200 ++++ argus-3.0.8.3/configure 2023-01-25 12:02:00.376669747 +0100 +@@ -8347,10 +8347,6 @@ + if test -f lib/libwrap.a; then + rm -rf lib/libwrap.a + fi +- case "$target_os" in +- linux*) +- V_WRAPDEP="$V_WRAPDEP -lnsl";; +- esac + fi + fi +